Merge tag 'u-boot-imx-20200804' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[J-u-boot.git] / include / configs / ge_bx50v3.h

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 98ef71daa1649ea76d219435d9170be4eb71328c..4fdc2b6596265166b605fd6682624590e414a930 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -46,9 +46,6 @@
 
 /* Serial Flash */
 
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
 #define CONFIG_LOADADDR        0x12000000
 
 #ifdef CONFIG_NFS_CMD
@@ -79,7 +76,6 @@
        NETWORKBOOT \
        "bootcause=POR\0" \
        "image=/boot/fitImage\0" \
-       "fdt_high=0xffffffff\0" \
        "dev=mmc\0" \
        "devnum=2\0" \
        "rootdev=mmcblk0p\0" \
@@ -93,8 +89,7 @@
                "if ext2load ${dev} ${devnum}:5 0x7000A000 /boot/console; " \
                        "then setenv quiet; fi\0" \
        "hasfirstboot=" \
-               "ext2load ${dev} ${devnum}:${partnum} 0x7000A000 " \
-               "/boot/bootcause/firstboot\0" \
+               "test -e ${dev} ${devnum}:${partnum} /boot/bootcause/firstboot\0" \
        "swappartitions=" \
                "setexpr partnum 3 - ${partnum}\0" \
        "failbootcmd=" \
@@ -146,15 +141,13 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_SYS_MEMTEST_START       0x10000000
-#define CONFIG_SYS_MEMTEST_END         0x10010000
-#define CONFIG_SYS_MEMTEST_SCRATCH     0x10800000
-
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 
+#define CONFIG_SYS_BOOTMAPSZ (256 << 20)     /* 256M */
+
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
@@ -172,7 +165,6 @@
 #define CONFIG_HIDE_LOGO_VERSION
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
-#define CONFIG_CMD_BMP
 
 #define CONFIG_IMX6_PWM_PER_CLK        66000000
 
@@ -181,6 +173,4 @@
 #define CONFIG_PCIE_IMX_PERST_GPIO     IMX_GPIO_NR(7, 12)
 #define CONFIG_PCIE_IMX_POWER_GPIO     IMX_GPIO_NR(1, 5)
 
-#define CONFIG_BCH
-
 #endif /* __GE_BX50V3_CONFIG_H */