From: Tom Rini Date: Mon, 9 Jan 2023 16:30:08 +0000 (-0500) Subject: Merge branch 'next' X-Git-Tag: v2023.04-rc1~28 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cebdfc22da6eb81793b616e855bc4d6d89c1c7a6;p=pandora-u-boot.git Merge branch 'next' Signed-off-by: Tom Rini --- cebdfc22da6eb81793b616e855bc4d6d89c1c7a6 diff --cc common/memsize.c index 54a6416717a,ad9ddf67ac5..66d5be6a1ff --- a/common/memsize.c +++ b/common/memsize.c @@@ -106,9 -105,8 +106,9 @@@ phys_size_t __weak get_effective_memsiz */ if (gd->ram_base + ram_size < gd->ram_base) ram_size = ((phys_size_t)~0xfffULL) - gd->ram_base; +#endif - #ifndef CONFIG_MAX_MEM_MAPPED + #ifndef CFG_MAX_MEM_MAPPED return ram_size; #else /* limit stack to what we can reasonable map */ diff --cc configs/P1010RDB-PA_36BIT_NOR_defconfig index a14a53fbd0f,6a320713ebd..71e17d90ec1 --- a/configs/P1010RDB-PA_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PA_36BIT_NOR_defconfig @@@ -9,7 -9,10 +9,9 @@@ CONFIG_MPC85xx= CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y + CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y + CONFIG_USE_UBOOTPATH=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PHYS_64BIT=y diff --cc configs/P1010RDB-PA_NOR_defconfig index f34a096b7db,071123362f5..5807e8bdaa4 --- a/configs/P1010RDB-PA_NOR_defconfig +++ b/configs/P1010RDB-PA_NOR_defconfig @@@ -9,7 -9,10 +9,9 @@@ CONFIG_MPC85xx= CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PA=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y + CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y + CONFIG_USE_UBOOTPATH=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 diff --cc configs/P1010RDB-PB_36BIT_NOR_defconfig index 4c1cdbb5fc8,bf7078015e2..7328c142f99 --- a/configs/P1010RDB-PB_36BIT_NOR_defconfig +++ b/configs/P1010RDB-PB_36BIT_NOR_defconfig @@@ -9,7 -9,10 +9,9 @@@ CONFIG_MPC85xx= CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y + CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y + CONFIG_USE_UBOOTPATH=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PHYS_64BIT=y diff --cc configs/P1010RDB-PB_NOR_defconfig index 3eb61fbe079,985243cebd8..0f109c514c1 --- a/configs/P1010RDB-PB_NOR_defconfig +++ b/configs/P1010RDB-PB_NOR_defconfig @@@ -9,7 -9,10 +9,9 @@@ CONFIG_MPC85xx= CONFIG_SYS_INIT_RAM_LOCK=y CONFIG_TARGET_P1010RDB_PB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y + CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y + CONFIG_USE_UBOOTPATH=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 diff --cc configs/P1020RDB-PC_36BIT_defconfig index d04e5063ce6,58f24755714..e2373d04d74 --- a/configs/P1020RDB-PC_36BIT_defconfig +++ b/configs/P1020RDB-PC_36BIT_defconfig @@@ -10,7 -10,10 +10,9 @@@ CONFIG_SYS_INIT_RAM_LOCK= # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PC=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y + CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y + CONFIG_USE_UBOOTPATH=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PHYS_64BIT=y diff --cc configs/P1020RDB-PC_defconfig index c7357e379d2,17bde92263b..ca828eac03d --- a/configs/P1020RDB-PC_defconfig +++ b/configs/P1020RDB-PC_defconfig @@@ -10,7 -10,10 +10,9 @@@ CONFIG_SYS_INIT_RAM_LOCK= # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PC=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y + CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y + CONFIG_USE_UBOOTPATH=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 diff --cc configs/P1020RDB-PD_defconfig index ffef3001d42,b0ccaa1cfde..5377aba4ef3 --- a/configs/P1020RDB-PD_defconfig +++ b/configs/P1020RDB-PD_defconfig @@@ -10,7 -10,10 +10,9 @@@ CONFIG_SYS_INIT_RAM_LOCK= # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P1020RDB_PD=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y + CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y + CONFIG_USE_UBOOTPATH=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 diff --cc configs/P2020RDB-PC_36BIT_defconfig index 6d020d7d294,bb5df66c749..d266ce82a59 --- a/configs/P2020RDB-PC_36BIT_defconfig +++ b/configs/P2020RDB-PC_36BIT_defconfig @@@ -10,7 -10,10 +10,9 @@@ CONFIG_SYS_INIT_RAM_LOCK= # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P2020RDB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y + CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y + CONFIG_USE_UBOOTPATH=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_PHYS_64BIT=y diff --cc configs/P2020RDB-PC_defconfig index 612ac053fd6,2afef4a5eb0..4d5569c5549 --- a/configs/P2020RDB-PC_defconfig +++ b/configs/P2020RDB-PC_defconfig @@@ -10,7 -10,10 +10,9 @@@ CONFIG_SYS_INIT_RAM_LOCK= # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_P2020RDB=y CONFIG_MPC85XX_HAVE_RESET_VECTOR=y + CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y -CONFIG_SYS_MPC85XX_NO_RESETVEC=y + CONFIG_USE_UBOOTPATH=y CONFIG_PCIE1=y CONFIG_PCIE2=y CONFIG_SYS_MONITOR_LEN=786432 diff --cc configs/evb-rk3288_defconfig index 2c2c679b290,8f8d34c7038..fcfb6aac1eb --- a/configs/evb-rk3288_defconfig +++ b/configs/evb-rk3288_defconfig @@@ -80,8 -80,8 +80,9 @@@ CONFIG_DM_REGULATOR_FIXED= CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 + CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y diff --cc configs/evb-rk3568_defconfig index e7996905784,7374ee42fb1..a76d924d387 --- a/configs/evb-rk3568_defconfig +++ b/configs/evb-rk3568_defconfig @@@ -63,6 -63,6 +63,7 @@@ CONFIG_SPL_RAM= CONFIG_DM_RESET=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 + CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y +# CONFIG_BINMAN_FDT is not set CONFIG_ERRNO_STR=y diff --cc configs/firefly-rk3288_defconfig index 12ed055acfa,26967a67cc9..434c9113b5e --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@@ -77,8 -77,8 +77,9 @@@ CONFIG_DM_REGULATOR_FIXED= CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 + CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y diff --cc configs/miqi-rk3288_defconfig index 2cf0efc816c,9346cafc64c..652e418ff39 --- a/configs/miqi-rk3288_defconfig +++ b/configs/miqi-rk3288_defconfig @@@ -74,8 -74,8 +74,9 @@@ CONFIG_DM_REGULATOR_FIXED= CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 + CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y diff --cc configs/rock-pi-n8-rk3288_defconfig index 757d99b8b58,18c6d1b9225..612663845c7 --- a/configs/rock-pi-n8-rk3288_defconfig +++ b/configs/rock-pi-n8-rk3288_defconfig @@@ -73,8 -73,8 +73,9 @@@ CONFIG_PWM_ROCKCHIP= CONFIG_RAM=y CONFIG_SPL_RAM=y # CONFIG_RAM_ROCKCHIP_DEBUG is not set +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 + CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --cc configs/sandbox_defconfig index be46cae7aad,f9c996b4299..de799b5cea3 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@@ -267,6 -266,6 +267,7 @@@ CONFIG_RESET_SYSCON= CONFIG_RESET_SCMI=y CONFIG_DM_RTC=y CONFIG_RTC_RV8803=y ++CONFIG_RTC_HT1380=y CONFIG_SCSI=y CONFIG_DM_SCSI=y CONFIG_SANDBOX_SERIAL=y diff --cc configs/tinker-rk3288_defconfig index e69ef6875f5,5976a84491e..c03256a0bf9 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig @@@ -82,8 -82,8 +82,9 @@@ CONFIG_REGULATOR_RK8XX= CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 + CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y diff --cc configs/tinker-s-rk3288_defconfig index eb153dc8d57,078f829c2df..294e5b1071d --- a/configs/tinker-s-rk3288_defconfig +++ b/configs/tinker-s-rk3288_defconfig @@@ -82,8 -82,8 +82,9 @@@ CONFIG_REGULATOR_RK8XX= CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 + CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y diff --cc configs/vyasa-rk3288_defconfig index f503cc16042,0c9d61b8053..47ccd708fca --- a/configs/vyasa-rk3288_defconfig +++ b/configs/vyasa-rk3288_defconfig @@@ -82,8 -82,8 +82,9 @@@ CONFIG_REGULATOR_RK8XX= CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 + CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y diff --cc include/configs/vexpress_common.h index aac96d29ba7,ba7731bfca6..2c1507a8186 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@@ -146,8 -145,7 +145,8 @@@ func(DHCP, dhcp, na) #include - #define CONFIG_EXTRA_ENV_SETTINGS \ + #define CFG_EXTRA_ENV_SETTINGS \ + "loadaddr=0x60100000\0" \ "kernel_addr_r=0x60100000\0" \ "fdt_addr_r=0x60000000\0" \ "bootargs=console=tty0 console=ttyAMA0,38400n8\0" \