Merge branch 'rpi-2023.04' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi

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

diff --git a/include/configs/socfpga_chameleonv3.h b/include/configs/socfpga_chameleonv3.h
index 891b762..fc08e74 100644 (file)
--- a/include/configs/socfpga_chameleonv3.h
+++ b/include/configs/socfpga_chameleonv3.h
@@ -7,8 +7,6 @@
 
 #include <asm/arch/base_addr_a10.h>
 
-#define CONFIG_SYS_BOOTM_LEN   (32 * 1024 * 1024)
-
 /*
  * U-Boot general configurations
  */
@@ -19,15 +17,13 @@
 /*
  * Serial / UART configurations
  */
-#define CONFIG_SYS_NS16550_MEM32
-#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}
+#define CFG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, 115200}
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       "autoload=no\0" \
-       "bootargs=cma=256M console=ttyS1,115200 root=/dev/mmcblk0p3 rw rootwait\0" \
-       "distro_bootcmd=bridge enable; run bootcmd_mmc\0" \
-       "bootcmd_mmc=load mmc 0:1 ${loadaddr} kernel.itb; bootm\0" \
-       "bootcmd_net=dhcp; tftpboot ${loadaddr} kernel.itb; bootm\0"
+#define CFG_EXTRA_ENV_SETTINGS \
+       "distro_bootcmd=bridge enable; " \
+               "load mmc 0:1 ${loadaddr} u-boot.txt; " \
+               "env import -t ${loadaddr}; " \
+               "run bootcmd_txt\0"
 
 /*
  * L4 OSC1 Timer 0
@@ -35,9 +31,6 @@
 /* reload value when timer count to zero */
 #define TIMER_LOAD_VAL                 0xFFFFFFFF
 
-/* SPL memory allocation configuration, this is for FAT implementation */
-#define CONFIG_SYS_SPL_MALLOC_SIZE     0x00015000
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>