diff --git a/0001-configs-tinker-rk3288-disable-CONFIG_SPL_I2C_SUPPORT.patch b/0001-configs-tinker-rk3288-disable-CONFIG_SPL_I2C_SUPPORT.patch deleted file mode 100644 index c8e1adf..0000000 --- a/0001-configs-tinker-rk3288-disable-CONFIG_SPL_I2C_SUPPORT.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 68b90e57bc034e237923b02acb633dc4e91d44cb Mon Sep 17 00:00:00 2001 -From: Heinrich Schuchardt -Date: Wed, 27 Feb 2019 20:05:43 +0100 -Subject: [PATCH] configs: tinker-rk3288 disable CONFIG_SPL_I2C_SUPPORT - -The SPL for the Tinker Board has to fit into 32 KiB. Currently this limit -is exceeded. - -CONFIG_SPL_I2C_SUPPORT is not needed to move to main U-Boot. So let's -disable it. - -Suggested-by: David Wu -Signed-off-by: Heinrich Schuchardt -Reviewed-by: David Wu -Reviewed-by: Philipp Tomsich ---- - configs/tinker-rk3288_defconfig | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig -index 4b48689ee8..0e8cf73fe9 100644 ---- a/configs/tinker-rk3288_defconfig -+++ b/configs/tinker-rk3288_defconfig -@@ -20,7 +20,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y - CONFIG_SPL_TEXT_BASE=0xff704000 - CONFIG_SPL_STACK_R=y - CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 --CONFIG_SPL_I2C_SUPPORT=y - CONFIG_CMD_GPIO=y - CONFIG_CMD_GPT=y - CONFIG_CMD_I2C=y --- -2.21.0 - diff --git a/aarch64-boards b/aarch64-boards index 18a2a4f..f6a2000 100644 --- a/aarch64-boards +++ b/aarch64-boards @@ -45,10 +45,12 @@ pinebook pine_h64 poplar puma-rk3399 +rock64-rk3328 rock960-rk3399 rock-pi-4-rk3399 rockpro64-rk3399 rpi_3 +rpi_4 sopine_baseboard teres_i turris_mox diff --git a/arm-boards b/arm-boards index 98b1141..76af0e2 100644 --- a/arm-boards +++ b/arm-boards @@ -117,6 +117,7 @@ rock rock2 rpi_2 rpi_3_32b +rpi_4_32b Sinlinx_SinA31s Sinovoip_BPI_M2 Sinovoip_BPI_M3 diff --git a/mvebu-enable-generic-distro-boot-config.patch b/mvebu-enable-generic-distro-boot-config.patch deleted file mode 100644 index 51ec5b5..0000000 --- a/mvebu-enable-generic-distro-boot-config.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 8de891d0767aafb383b6f533b08a5c0b75b4718b Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Mon, 18 Sep 2017 15:48:32 +0100 -Subject: [PATCH] arm: mvebu: enable generic distro boot config - -Switch all of the mvebu boards to support disto generic booting -This will enable Fedora, Debian and other distros to support -mvebu systems easier. Tested on SolidRun ClearFog - -Signed-off-by: Dennis Gilmore -Signed-off-by: Peter Robinson ---- - include/configs/mv-common.h | 84 +++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 84 insertions(+) - -diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h -index 7c2bab2fc6..2819493fca 100644 ---- a/include/configs/mv-common.h -+++ b/include/configs/mv-common.h -@@ -130,4 +130,88 @@ - #define CONFIG_MTD_PARTITIONS - #endif - -+#ifndef CONFIG_SPL_BUILD -+#include -+ -+/* -+* 160M RAM (256M minimum minus 64MB heap + 32MB for u-boot, stack, fb, etc. -+* 32M uncompressed kernel, 16M compressed kernel, 1M fdt, -+* 1M script, 1M pxe and the ramdisk at the end. -+*/ -+#define SDRAM_OFFSET(x) 0x0##x -+ -+#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(2000000)) -+#define FDT_ADDR_R __stringify(SDRAM_OFFSET(3000000)) -+#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(3100000)) -+#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(3200000)) -+#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(3300000)) -+ -+#define MEM_LAYOUT_ENV_SETTINGS \ -+ "bootm_size=0xa000000\0" \ -+ "kernel_addr_r=" KERNEL_ADDR_R "\0" \ -+ "fdt_addr_r=" FDT_ADDR_R "\0" \ -+ "scriptaddr=" SCRIPT_ADDR_R "\0" \ -+ "pxefile_addr_r=" PXEFILE_ADDR_R "\0" \ -+ "ramdisk_addr_r=" RAMDISK_ADDR_R "\0" -+ -+#ifdef CONFIG_MMC -+#define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) -+#else -+#define BOOT_TARGET_DEVICES_MMC(func) -+#endif -+ -+#ifdef CONFIG_CMD_SATA -+#define BOOT_TARGET_DEVICES_SATA(func) func(SATA, sata, 0) func(SATA, sata, 1) -+#define CONFIG_PREBOOT "sata init" -+#else -+#define BOOT_TARGET_DEVICES_SATA(func) -+#endif -+ -+#ifdef CONFIG_USB_STORAGE -+#define BOOT_TARGET_DEVICES_USB(func) func(USB, usb, 0) -+#else -+#define BOOT_TARGET_DEVICES_USB(func) -+#endif -+ -+#define BOOT_TARGET_DEVICES(func) \ -+ BOOT_TARGET_DEVICES_MMC(func) \ -+ BOOT_TARGET_DEVICES_SATA(func) \ -+ BOOT_TARGET_DEVICES_USB(func) \ -+ func(PXE, pxe, na) -+ -+#include -+ -+#ifdef CONFIG_USB_KEYBOARD -+#define CONSOLE_STDIN_SETTINGS \ -+ "preboot=usb start\0" \ -+ "stdin=serial,usbkbd\0" -+#else -+#define CONSOLE_STDIN_SETTINGS \ -+ "stdin=serial\0" -+#endif -+ -+#ifdef CONFIG_VIDEO -+#define CONSOLE_STDOUT_SETTINGS \ -+ "stdout=serial,vga\0" \ -+ "stderr=serial,vga\0" -+#else -+#define CONSOLE_STDOUT_SETTINGS \ -+ "stdout=serial\0" \ -+ "stderr=serial\0" -+#endif -+ -+#define CONSOLE_ENV_SETTINGS \ -+ CONSOLE_STDIN_SETTINGS \ -+ CONSOLE_STDOUT_SETTINGS -+ -+#define CONFIG_EXTRA_ENV_SETTINGS \ -+ CONSOLE_ENV_SETTINGS \ -+ MEM_LAYOUT_ENV_SETTINGS \ -+ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ -+ "console=ttyS0,115200\0" \ -+ BOOTENV -+#else /* ifndef CONFIG_SPL_BUILD */ -+#define CONFIG_EXTRA_ENV_SETTINGS -+#endif -+ - #endif /* _MV_COMMON_H */ --- -2.13.5 - diff --git a/mx6-utilite-distro-boot.patch b/mx6-utilite-distro-boot.patch deleted file mode 100644 index b2fd480..0000000 --- a/mx6-utilite-distro-boot.patch +++ /dev/null @@ -1,154 +0,0 @@ -From af017eb82317dc88c1b23301d76466b389c2e007 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Tue, 13 Sep 2016 08:47:34 +0100 -Subject: [PATCH] port utilite to distro generic boot commands - ---- - include/configs/cm_fx6.h | 115 ++++++++++++----------------------------------- - 1 file changed, 29 insertions(+), 86 deletions(-) - -diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h -index c839b03..4dd501e 100644 ---- a/include/configs/cm_fx6.h -+++ b/include/configs/cm_fx6.h -@@ -11,6 +11,7 @@ - #ifndef __CONFIG_CM_FX6_H - #define __CONFIG_CM_FX6_H - -+#include - #include "mx6_common.h" - - /* Machine config */ -@@ -78,101 +79,43 @@ - #define CONFIG_ENV_SIZE (8 * 1024) - #define CONFIG_ENV_OFFSET (768 * 1024) - -+#ifndef CONFIG_SPL_BUILD -+#include -+#include -+ -+#ifdef CONFIG_AHCI -+#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) -+#else -+#define BOOT_TARGET_DEVICES_SCSI(func) -+#endif -+ -+#define BOOT_TARGET_DEVICES(func) \ -+ func(MMC, mmc, 2) \ -+ BOOT_TARGET_DEVICES_SCSI(func) \ -+ func(PXE, pxe, na) \ -+ func(DHCP, dhcp, na) -+ - #define CONFIG_EXTRA_ENV_SETTINGS \ - "stdin=serial,usbkbd\0" \ - "stdout=serial,vga\0" \ - "stderr=serial,vga\0" \ - "panel=HDMI\0" \ -- "autoload=no\0" \ -- "uImage=uImage-cm-fx6\0" \ -- "zImage=zImage-cm-fx6\0" \ -- "kernel=uImage-cm-fx6\0" \ -- "script=boot.scr\0" \ -- "dtb=cm-fx6.dtb\0" \ -- "bootm_low=18000000\0" \ -+ "dtb=imx6q-utilite-pro.dts\0" \ - "loadaddr=0x10800000\0" \ - "fdtaddr=0x11000000\0" \ -+ "fdt_addr_r=0x18000000\0" \ -+ "pxefile_addr_r=0x17f00000\0" \ -+ "scriptaddr=0x17e00000\0" \ -+ "kernel_addr_r=0x11000000\0" \ -+ "ramdisk_addr_r=0x18100000\0" \ -+ "bootm_size=0x20000000\0" \ - "console=ttymxc3,115200\0" \ - "ethprime=FEC0\0" \ -- "video_hdmi=mxcfb0:dev=hdmi,1920x1080M-32@50,if=RGB32\0" \ -- "video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \ -- "doboot=bootm ${loadaddr}\0" \ -- "doloadfdt=false\0" \ -- "mtdids=" MTDIDS_DEFAULT "\0" \ -- "mtdparts=" MTDPARTS_DEFAULT "\0" \ -- "setboottypez=setenv kernel ${zImage};" \ -- "setenv doboot bootz ${loadaddr} - ${fdtaddr};" \ -- "setenv doloadfdt true;\0" \ -- "setboottypem=setenv kernel ${uImage};" \ -- "setenv doboot bootm ${loadaddr};" \ -- "setenv doloadfdt false;\0"\ -- "mmcroot=/dev/mmcblk0p2 rw rootwait\0" \ -- "sataroot=/dev/sda2 rw rootwait\0" \ -- "nandroot=/dev/mtdblock4 rw\0" \ -- "nandrootfstype=ubifs\0" \ -- "mmcargs=setenv bootargs console=${console} root=${mmcroot} " \ -- "${video} ${extrabootargs}\0" \ -- "sataargs=setenv bootargs console=${console} root=${sataroot} " \ -- "${video} ${extrabootargs}\0" \ -- "nandargs=setenv bootargs console=${console} " \ -- "root=${nandroot} " \ -- "rootfstype=${nandrootfstype} " \ -- "${video} ${extrabootargs}\0" \ -- "nandboot=if run nandloadkernel; then " \ -- "run nandloadfdt;" \ -- "run setboottypem;" \ -- "run storagebootcmd;" \ -- "run setboottypez;" \ -- "run storagebootcmd;" \ -- "fi;\0" \ -- "run_eboot=echo Starting EBOOT ...; "\ -- "mmc dev 2 && " \ -- "mmc rescan && mmc read 10042000 a 400 && go 10042000\0" \ -- "loadscript=load ${storagetype} ${storagedev} ${loadaddr} ${script};\0"\ -- "loadkernel=load ${storagetype} ${storagedev} ${loadaddr} ${kernel};\0"\ -- "loadfdt=load ${storagetype} ${storagedev} ${fdtaddr} ${dtb};\0" \ -- "bootscript=echo Running bootscript from ${storagetype} ...;" \ -- "source ${loadaddr};\0" \ -- "nandloadkernel=nand read ${loadaddr} 0 780000;\0" \ -- "nandloadfdt=nand read ${fdtaddr} 780000 80000;\0" \ -- "setupmmcboot=setenv storagetype mmc; setenv storagedev 2;\0" \ -- "setupsataboot=setenv storagetype sata; setenv storagedev 0;\0" \ -- "setupnandboot=setenv storagetype nand;\0" \ -- "setupusbboot=setenv storagetype usb; setenv storagedev 0;\0" \ -- "storagebootcmd=echo Booting from ${storagetype} ...;" \ -- "run ${storagetype}args; run doboot;\0" \ -- "trybootk=if run loadkernel; then " \ -- "if ${doloadfdt}; then " \ -- "run loadfdt;" \ -- "fi;" \ -- "run storagebootcmd;" \ -- "fi;\0" \ -- "trybootsmz=if run loadscript; then " \ -- "run bootscript;" \ -- "fi;" \ -- "run setboottypem;" \ -- "run trybootk;" \ -- "run setboottypez;" \ -- "run trybootk;\0" -- --#define CONFIG_BOOTCOMMAND \ -- "run setupmmcboot;" \ -- "mmc dev ${storagedev};" \ -- "if mmc rescan; then " \ -- "run trybootsmz;" \ -- "fi;" \ -- "run setupusbboot;" \ -- "if usb start; then "\ -- "if run loadscript; then " \ -- "run bootscript;" \ -- "fi;" \ -- "fi;" \ -- "run setupsataboot;" \ -- "if sata init; then " \ -- "run trybootsmz;" \ -- "fi;" \ -- "run setupnandboot;" \ -- "run nandboot;" -+ BOOTENV -+ -+#else /* ifndef CONFIG_SPL_BUILD */ -+#define CONFIG_EXTRA_ENV_SETTINGS -+#endif - - #define CONFIG_PREBOOT "usb start;sf probe" - --- -2.9.3 - diff --git a/sources b/sources index a94cd69..e52d8c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (u-boot-2019.07-rc4.tar.bz2) = 71aa6e2eb30a3abf136a4128fb8bf00c8b1b71d6bc35cc65daac058fd4dae135080e4683c092edefffc6c1ba227bf07b49721b889ddfa02e7872beb5ab5fe92f +SHA512 (u-boot-2019.10-rc2.tar.bz2) = 5a9173a1bd945736c8e0c1797b4c8fdd9833fc4e04d6b0e562c2018884da9bc10c110231b690450fb2761e19cd19ab24fc8744000c901f416ba2936c8278799e diff --git a/tegra-TX-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch b/tegra-TX-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch deleted file mode 100644 index 20fa98d..0000000 --- a/tegra-TX-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 80dda7644f2691d599bc87a7a96645bda0305424 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Wed, 20 Mar 2019 09:29:49 +0000 -Subject: [PATCH] tegra: TX: Add CONFIG_EFI_LOADER_BOUNCE_BUFFER - -Signed-off-by: Peter Robinson ---- - configs/p2371-2180_defconfig | 1 + - configs/p2771-0000-000_defconfig | 1 + - configs/p2771-0000-500_defconfig | 1 + - configs/p3450-0000_defconfig | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig -index b662ef1431..c1b87a8071 100644 ---- a/configs/p2371-2180_defconfig -+++ b/configs/p2371-2180_defconfig -@@ -5,6 +5,7 @@ CONFIG_TEGRA210=y - CONFIG_TARGET_P2371_2180=y - CONFIG_NR_DRAM_BANKS=2 - CONFIG_OF_SYSTEM_SETUP=y -+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y - CONFIG_CONSOLE_MUX=y - CONFIG_SYS_STDIO_DEREGISTER=y - CONFIG_SYS_PROMPT="Tegra210 (P2371-2180) # " -diff --git a/configs/p2771-0000-000_defconfig b/configs/p2771-0000-000_defconfig -index ad0802067e..799a06e454 100644 ---- a/configs/p2771-0000-000_defconfig -+++ b/configs/p2771-0000-000_defconfig -@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x80080000 - CONFIG_TEGRA186=y - CONFIG_NR_DRAM_BANKS=1026 - CONFIG_OF_SYSTEM_SETUP=y -+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y - CONFIG_CONSOLE_MUX=y - CONFIG_SYS_STDIO_DEREGISTER=y - CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-000) # " -diff --git a/configs/p2771-0000-500_defconfig b/configs/p2771-0000-500_defconfig -index 459b67fd19..6193cff822 100644 ---- a/configs/p2771-0000-500_defconfig -+++ b/configs/p2771-0000-500_defconfig -@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x80080000 - CONFIG_TEGRA186=y - CONFIG_NR_DRAM_BANKS=1026 - CONFIG_OF_SYSTEM_SETUP=y -+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y - CONFIG_CONSOLE_MUX=y - CONFIG_SYS_STDIO_DEREGISTER=y - CONFIG_SYS_PROMPT="Tegra186 (P2771-0000-500) # " -diff --git a/configs/p3450-0000_defconfig b/configs/p3450-0000_defconfig -index 32c2b65a29..6da9daebe5 100644 ---- a/configs/p3450-0000_defconfig -+++ b/configs/p3450-0000_defconfig -@@ -7,6 +7,7 @@ CONFIG_TARGET_P3450_0000=y - CONFIG_NR_DRAM_BANKS=2 - CONFIG_OF_SYSTEM_SETUP=y - CONFIG_OF_BOARD_SETUP=y -+CONFIG_EFI_LOADER_BOUNCE_BUFFER=y - CONFIG_CONSOLE_MUX=y - CONFIG_SYS_STDIO_DEREGISTER=y - CONFIG_SYS_PROMPT="Tegra210 (P3450-0000) # " --- -2.20.1 - diff --git a/tegra186-jetson-tx2-disable-onboard-emmc.patch b/tegra186-jetson-tx2-disable-onboard-emmc.patch deleted file mode 100644 index d31a6df..0000000 --- a/tegra186-jetson-tx2-disable-onboard-emmc.patch +++ /dev/null @@ -1,52 +0,0 @@ -From dbe4dff86520a1373076563d1bee5ada1d7fd7c5 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Thu, 26 Apr 2018 16:56:54 +0100 -Subject: [PATCH] tegra186: jetson-tx2: disable onboard emmc - -Signed-off-by: Peter Robinson ---- - arch/arm/dts/tegra186-p2771-0000.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/dts/tegra186-p2771-0000.dtsi b/arch/arm/dts/tegra186-p2771-0000.dtsi -index a1319dc493..e220f086ee 100644 ---- a/arch/arm/dts/tegra186-p2771-0000.dtsi -+++ b/arch/arm/dts/tegra186-p2771-0000.dtsi -@@ -53,7 +53,7 @@ - }; - - sdhci@3460000 { -- status = "okay"; -+ status = "disabled"; - bus-width = <8>; - non-removable; - }; --- -2.17.0 - -From 7bba3cc32c8b8b5d3688c42a803768761df0a23f Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Wed, 1 Aug 2018 11:47:56 +0100 -Subject: [PATCH] tegra210: Jetson TX1: disable onboard emmc - -Signed-off-by: Peter Robinson ---- - arch/arm/dts/tegra210-p2371-2180.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/dts/tegra210-p2371-2180.dts b/arch/arm/dts/tegra210-p2371-2180.dts -index da4349bd039..87ce030e701 100644 ---- a/arch/arm/dts/tegra210-p2371-2180.dts -+++ b/arch/arm/dts/tegra210-p2371-2180.dts -@@ -80,7 +80,7 @@ - }; - - sdhci@700b0600 { -- status = "okay"; -+ status = "disabled"; - bus-width = <8>; - non-removable; - }; --- -2.17.1 - diff --git a/ti-am335x_evm-Enable-CONFIG_SPL_OF_CONTROL.patch b/ti-am335x_evm-Enable-CONFIG_SPL_OF_CONTROL.patch deleted file mode 100644 index 8415e8f..0000000 --- a/ti-am335x_evm-Enable-CONFIG_SPL_OF_CONTROL.patch +++ /dev/null @@ -1,183 +0,0 @@ -From patchwork Tue Mar 19 11:19:21 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [U-Boot] ti: am335x_evm: Enable CONFIG_SPL_OF_CONTROL -X-Patchwork-Submitter: Tom Rini -X-Patchwork-Id: 1058350 -X-Patchwork-Delegate: trini@ti.com -Message-Id: <1552994361-32058-1-git-send-email-trini@konsulko.com> -To: u-boot@lists.denx.de -Date: Tue, 19 Mar 2019 07:19:21 -0400 -From: Tom Rini -List-Id: U-Boot discussion - -Enable support for SPL_OF_CONTROL on this platform. That means doing a -few things: -- Add u-boot,dm-pre-reloc to a number of nodes -- Drop static platdata in the board file. -- A lot of tweaks to the defconfig. We remove some things such as - SPL_USE_ARCH_MEMCPY/SET for space. Increase our malloc len. -- Drop, for now at least, USB SPL support as it's causing a hang. - -Cc: Faiz Abbas -Cc: Lokesh Vutla -Signed-off-by: Tom Rini ---- - arch/arm/dts/am335x-evm-u-boot.dtsi | 45 +++++++++++++++++++++++++++++++++++-- - board/ti/am335x/board.c | 30 ------------------------- - configs/am335x_evm_defconfig | 14 ++++++++---- - 3 files changed, 53 insertions(+), 36 deletions(-) - -diff --git a/arch/arm/dts/am335x-evm-u-boot.dtsi b/arch/arm/dts/am335x-evm-u-boot.dtsi -index b6b97ed16d91..16a9f855ad1f 100644 ---- a/arch/arm/dts/am335x-evm-u-boot.dtsi -+++ b/arch/arm/dts/am335x-evm-u-boot.dtsi -@@ -3,11 +3,52 @@ - * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ - */ - -+#include "am33xx-u-boot.dtsi" - --&mmc3 { -- status = "disabled"; -+&l4_wkup { -+ u-boot,dm-pre-reloc; -+}; -+ -+&scm { -+ u-boot,dm-pre-reloc; -+}; -+ -+&am33xx_pinmux { -+ u-boot,dm-pre-reloc; -+}; -+ -+&uart0_pins { -+ u-boot,dm-pre-reloc; -+}; -+ -+&uart0 { -+ u-boot,dm-pre-reloc; -+}; -+ -+&gpio0 { -+ u-boot,dm-pre-reloc; -+}; -+ -+&i2c0 { -+ u-boot,dm-pre-reloc; -+}; -+ -+&i2c0_pins { -+ u-boot,dm-pre-reloc; - }; - - &usb0 { - dr_mode = "peripheral"; - }; -+ -+&mmc1 { -+ u-boot,dm-pre-reloc; -+}; -+ -+&mmc1_pins { -+ u-boot,dm-pre-reloc; -+}; -+ -+&mmc3 { -+ status = "disabled"; -+}; -diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c -index d67f94ad47ba..bfad1a75a456 100644 ---- a/board/ti/am335x/board.c -+++ b/board/ti/am335x/board.c -@@ -1054,33 +1054,3 @@ void board_fit_image_post_process(void **p_image, size_t *p_size) - secure_boot_verify_image(p_image, p_size); - } - #endif -- --#if !CONFIG_IS_ENABLED(OF_CONTROL) --static const struct omap_hsmmc_plat am335x_mmc0_platdata = { -- .base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE, -- .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_4BIT, -- .cfg.f_min = 400000, -- .cfg.f_max = 52000000, -- .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195, -- .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT, --}; -- --U_BOOT_DEVICE(am335x_mmc0) = { -- .name = "omap_hsmmc", -- .platdata = &am335x_mmc0_platdata, --}; -- --static const struct omap_hsmmc_plat am335x_mmc1_platdata = { -- .base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE, -- .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_8BIT, -- .cfg.f_min = 400000, -- .cfg.f_max = 52000000, -- .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195, -- .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT, --}; -- --U_BOOT_DEVICE(am335x_mmc1) = { -- .name = "omap_hsmmc", -- .platdata = &am335x_mmc1_platdata, --}; --#endif -diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig -index 924116835251..dd690dcb495c 100644 ---- a/configs/am335x_evm_defconfig -+++ b/configs/am335x_evm_defconfig -@@ -1,23 +1,26 @@ - CONFIG_ARM=y -+# CONFIG_SPL_USE_ARCH_MEMCPY is not set -+# CONFIG_SPL_USE_ARCH_MEMSET is not set - CONFIG_ARCH_OMAP2PLUS=y - CONFIG_TI_COMMON_CMD_OPTIONS=y -+CONFIG_SYS_MALLOC_F_LEN=0x4000 - CONFIG_AM33XX=y -+CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000 - CONFIG_SPL=y - CONFIG_DISTRO_DEFAULTS=y -+CONFIG_TPL_SYS_MALLOC_F_LEN=0x1000 - CONFIG_SPL_LOAD_FIT=y - CONFIG_OF_BOARD_SETUP=y - CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd" -+CONFIG_LOGLEVEL=3 - CONFIG_SYS_CONSOLE_INFO_QUIET=y - CONFIG_VERSION_VARIABLE=y - CONFIG_ARCH_MISC_INIT=y - # CONFIG_SPL_FS_EXT4 is not set - CONFIG_SPL_MTD_SUPPORT=y --CONFIG_SPL_MUSB_NEW_SUPPORT=y - CONFIG_SPL_NET_SUPPORT=y - CONFIG_SPL_NET_VCI_STRING="AM33xx U-Boot SPL" - CONFIG_SPL_OS_BOOT=y --CONFIG_SPL_USB_GADGET=y --CONFIG_SPL_USB_ETHER=y - CONFIG_CMD_SPL=y - CONFIG_CMD_SPL_NAND_OFS=0x00080000 - # CONFIG_CMD_FLASH is not set -@@ -28,10 +31,12 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand.0" - CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" - # CONFIG_SPL_EFI_PARTITION is not set - CONFIG_OF_CONTROL=y -+CONFIG_SPL_OF_CONTROL=y - CONFIG_DEFAULT_DEVICE_TREE="am335x-evm" - CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2" -+CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent" - CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y --# CONFIG_BLK is not set -+CONFIG_SPL_OF_TRANSLATE=y - CONFIG_BOOTCOUNT_LIMIT=y - CONFIG_DFU_MMC=y - CONFIG_DFU_NAND=y -@@ -68,5 +73,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451 - CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 - CONFIG_USB_ETHER=y - CONFIG_DYNAMIC_CRC_TABLE=y -+CONFIG_SPL_TINY_MEMSET=y - CONFIG_RSA=y - CONFIG_LZO=y diff --git a/uboot-tools.spec b/uboot-tools.spec index 3fc6c8b..a3dd55a 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -%global candidate rc4 +%global candidate rc2 Name: uboot-tools -Version: 2019.07 -Release: 0.2%{?candidate:.%{candidate}}.1.riscv64%{?dist} +Version: 2019.10 +Release: 0.1%{?candidate:.%{candidate}}.0.riscv64%{?dist} Summary: U-Boot utilities License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ URL: http://www.denx.de/wiki/U-Boot @@ -27,7 +27,6 @@ Patch6: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch Patch7: dragonboard-fixes.patch Patch8: ARM-tegra-Add-NVIDIA-Jetson-Nano.patch Patch9: arm-tegra-defaine-fdtfile-for-all-devices.patch -Patch10: 0001-configs-tinker-rk3288-disable-CONFIG_SPL_I2C_SUPPORT.patch Patch20: 0002-distro_bootcmd-refactor-virtio-to-support-PCI-block-.patch Patch21: 0001-qemu-riscv-enable-VIRTIO_PCI.patch @@ -134,6 +133,11 @@ do echo "Board: $board using sun50i_h6" cp /usr/share/arm-trusted-firmware/sun50i_h6/* builds/$(echo $board)/ fi + rk3328=(rock64-rk3328) + if [[ " ${rk3328[*]} " == *" $board "* ]]; then + echo "Board: $board using rk3328" + cp /usr/share/arm-trusted-firmware/rk3328/* builds/$(echo $board)/ + fi rk3399=(evb-rk3399 ficus-rk3399 firefly-rk3399 nanopc-t4-rk3399 nanopi-m4-rk3399 nanopi-neo4-rk3399 orangepi-rk3399 orangepi-rk3399 puma-rk3399 rock960-rk3399 rock-pi-4-rk3399 rockpro64-rk3399) if [[ " ${rk3399[*]} " == *" $board "* ]]; then echo "Board: $board using rk3399" @@ -142,10 +146,8 @@ do # End ATF make $(echo $board)_defconfig O=builds/$(echo $board)/ make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} V=1 O=builds/$(echo $board)/ - rk33xx=(evb-rk3399 ficus-rk3399 firefly-rk3399 nanopc-t4-rk3399 nanopi-m4-rk3399 nanopi-neo4-rk3399 orangepi-rk3399 orangepi-rk3399 puma-rk3399 rock960-rk3399 rock-pi-4-rk3399 rockpro64-rk3399) - if [[ " ${rk33xx[*]} " == *" $board "* ]]; then - echo "Board: $board using rk33xx" - make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" u-boot.itb V=1 O=builds/$(echo $board)/ + if [[ " ${rk3399[*]} " == *" $board "* ]]; then + echo "Board: $board using rk3399" builds/$(echo $board)/tools/mkimage -n rk3399 -T rksd -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_sd.img builds/$(echo $board)/tools/mkimage -n rk3399 -T rkspi -d builds/$(echo $board)/spl/u-boot-spl.bin builds/$(echo $board)/spl_spi.img fi @@ -292,11 +294,26 @@ cp -p board/warp7/README builds/docs/README.warp7 %endif %changelog -* Thu Jul 4 2019 David Abdurachmanov 2019.07-0.2-rc4.1.riscv64 +* Fri Aug 23 2019 David Abdurachmanov 2019.10-0.1-rc2.0.riscv64 - Run "virtio scan" before booting from VirtIO Block Device over PCIe transport - Add VIRTIO_PCI for RISC-V QEMU emulation - Add support for RISC-V (riscv64) +* Wed Aug 14 2019 Peter Robinson 2019.10-0.1-rc2 +- 2019.10 RC2 + +* Sun Aug 4 2019 Peter Robinson 2019.07-3 +- Fixes for Rock960 +- Iniital Raspberry Pi 4 support + +* Sat Jul 27 2019 Fedora Release Engineering - 2019.07-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jul 8 2019 Peter Robinson 2019.07-1 +- 2019.07 +- Enable Rock64 +- Rock960 enhancements + * Fri Jun 28 2019 Peter Robinson 2019.07-0.2-rc4 - Fix build with explicit python2 - Drop a couple of unused boards