Merge branch 'master' of git://git.denx.de/u-boot-net

[platform/kernel/u-boot.git] / include / configs / pico-imx7d.h

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 8f1876c..0e770bf 100644 (file)
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -31,7 +31,6 @@
 
 /* Network */
 #define CONFIG_FEC_MXC
-#define CONFIG_MII
 #define CONFIG_FEC_XCV_TYPE            RGMII
 #define CONFIG_ETHPRIME                        "FEC"
 #define CONFIG_FEC_MXC_PHYADDR         1
@@ -49,11 +48,14 @@
                "spl raw 0x2 0x400 mmcpart 1;" \
                "u-boot raw 0x8a 0x400 mmcpart 1;" \
                "/boot/zImage ext4 0 1;" \
+               "/boot/imx7d-pico-hobbit.dtb ext4 0 1;" \
                "/boot/imx7d-pico-pi.dtb ext4 0 1;" \
                "rootfs part 0 1\0" \
 
 #define BOOTMENU_ENV \
-       "bootmenu_0=Boot using PICO-PI baseboard=" \
+       "bootmenu_0=Boot using PICO-Hobbit baseboard=" \
+               "setenv fdtfile imx7d-pico-hobbit.dtb\0" \
+       "bootmenu_1=Boot using PICO-Pi baseboard=" \
                "setenv fdtfile imx7d-pico-pi.dtb\0" \
 
 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
@@ -65,7 +67,7 @@
        "console=ttymxc4\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
-       "fdtfile=ask\0" \
+       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
        BOOTMENU_ENV \
        "fdt_addr=0x83000000\0" \
        "fdt_addr_r=0x83000000\0" \
@@ -101,7 +103,6 @@
 #define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM