From: Tom Rini Date: Mon, 9 Jan 2023 16:30:08 +0000 (-0500) Subject: Merge branch 'next' X-Git-Tag: baikal/mips/sdk5.8.2~5^2~97 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=eedd6e5b1878f58b8991b3c8136ccc0ac92f5d2c;p=uboot.git Merge branch 'next' Signed-off-by: Tom Rini --- eedd6e5b1878f58b8991b3c8136ccc0ac92f5d2c diff --cc common/memsize.c index 54a6416717,ad9ddf67ac..66d5be6a1f --- 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 a14a53fbd0,6a320713eb..71e17d90ec --- 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 f34a096b7d,071123362f..5807e8bdaa --- 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 4c1cdbb5fc,bf7078015e..7328c142f9 --- 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 3eb61fbe07,985243cebd..0f109c514c --- 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 d04e5063ce,58f2475571..e2373d04d7 --- 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 c7357e379d,17bde92263..ca828eac03 --- 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 ffef3001d4,b0ccaa1cfd..5377aba4ef --- 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 6d020d7d29,bb5df66c74..d266ce82a5 --- 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 612ac053fd,2afef4a5eb..4d5569c554 --- 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 2c2c679b29,8f8d34c703..fcfb6aac1e --- 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 e799690578,7374ee42fb..a76d924d38 --- 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 12ed055acf,26967a67cc..434c9113b5 --- 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 2cf0efc816,9346cafc64..652e418ff3 --- 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 757d99b8b5,18c6d1b922..612663845c --- 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 be46cae7aa,f9c996b429..de799b5cea --- 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 e69ef6875f,5976a84491..c03256a0bf --- 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 eb153dc8d5,078f829c2d..294e5b1071 --- 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 f503cc1604,0c9d61b805..47ccd708fc --- 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 aac96d29ba,ba7731bfca..2c1507a818 --- 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" \