From 0c962d6d005c42011227550fa608411a880aca9b Mon Sep 17 00:00:00 2001 From: wisdoman Date: Fri, 17 Jan 2020 10:22:42 +0800 Subject: [PATCH 1/2] delete patch and modify spec --- ...-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch | 54 -- tegra-fix-tx1.patch | 472 ------------------ ...a186-jetson-tx2-disable-onboard-emmc.patch | 52 -- uboot-tools.spec | 34 +- ...DT-from-any-partition-on-boot-device.patch | 83 --- uefi-use-specific-path-name.patch | 47 -- 6 files changed, 15 insertions(+), 727 deletions(-) delete mode 100644 tegra-TXx-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch delete mode 100644 tegra-fix-tx1.patch delete mode 100644 tegra186-jetson-tx2-disable-onboard-emmc.patch delete mode 100644 uefi-distro-load-FDT-from-any-partition-on-boot-device.patch delete mode 100644 uefi-use-specific-path-name.patch diff --git a/tegra-TXx-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch b/tegra-TXx-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch deleted file mode 100644 index 3364bb1..0000000 --- a/tegra-TXx-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c8b9f0c2ca0a4270db811867ad051e75efa4100a Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Wed, 5 Sep 2018 11:13:40 +0100 -Subject: [PATCH] tegra: TXx: Add CONFIG_EFI_LOADER_BOUNCE_BUFFER - -The Jetson TX series needs EFI loader bounce buffer enabled otherwise grub doesn't see -the storage when it loads. - -Signed-off-by: Peter Robinson ---- - configs/p2371-2180_defconfig | 1 + - configs/p2771-0000-000_defconfig | 1 + - configs/p2771-0000-500_defconfig | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig -index d9dcf7e014..156a1cbcf9 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 2bf2e31359..15ea2fc6d6 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=8 - 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 1e33c1f95b..a32b6a866e 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=8 - 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) # " --- -2.19.0.rc0 - diff --git a/tegra-fix-tx1.patch b/tegra-fix-tx1.patch deleted file mode 100644 index 9c03262..0000000 --- a/tegra-fix-tx1.patch +++ /dev/null @@ -1,472 +0,0 @@ -From a2872b1e2f81e04f92f0970e18c6c8a40640eea8 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Wed, 5 Sep 2018 12:11:40 +0100 -Subject: [PATCH] tegra fix tx1 - -Signed-off-by: Peter Robinson ---- - arch/arm/include/asm/arch-tegra/xusb-padctl.h | 1 + - arch/arm/mach-tegra/board.c | 4 +- - arch/arm/mach-tegra/board2.c | 12 ++++ - arch/arm/mach-tegra/dt-setup.c | 5 +- - arch/arm/mach-tegra/gpu.c | 2 + - .../mach-tegra/{tegra186 => }/nvtboot_board.c | 70 +++++++++++++++++++ - .../mach-tegra/{tegra186 => }/nvtboot_ll.S | 0 - .../mach-tegra/{tegra186 => }/nvtboot_mem.c | 0 - arch/arm/mach-tegra/tegra186/Makefile | 6 +- - arch/arm/mach-tegra/tegra210/Makefile | 3 + - arch/arm/mach-tegra/tegra210/clock.c | 19 ----- - arch/arm/mach-tegra/tegra210/xusb-padctl.c | 68 +++++++++++------- - arch/arm/mach-tegra/xusb-padctl-dummy.c | 4 ++ - configs/p2371-0000_defconfig | 2 +- - configs/p2371-2180_defconfig | 2 +- - configs/p2571_defconfig | 2 +- - 16 files changed, 146 insertions(+), 54 deletions(-) - rename arch/arm/mach-tegra/{tegra186 => }/nvtboot_board.c (84%) - rename arch/arm/mach-tegra/{tegra186 => }/nvtboot_ll.S (100%) - rename arch/arm/mach-tegra/{tegra186 => }/nvtboot_mem.c (100%) - -diff --git a/arch/arm/include/asm/arch-tegra/xusb-padctl.h b/arch/arm/include/asm/arch-tegra/xusb-padctl.h -index deccdf455d..7e14d8109d 100644 ---- a/arch/arm/include/asm/arch-tegra/xusb-padctl.h -+++ b/arch/arm/include/asm/arch-tegra/xusb-padctl.h -@@ -16,6 +16,7 @@ struct tegra_xusb_phy; - struct tegra_xusb_phy *tegra_xusb_phy_get(unsigned int type); - - void tegra_xusb_padctl_init(void); -+void tegra_xusb_padctl_exit(void); - int tegra_xusb_phy_prepare(struct tegra_xusb_phy *phy); - int tegra_xusb_phy_enable(struct tegra_xusb_phy *phy); - int tegra_xusb_phy_disable(struct tegra_xusb_phy *phy); -diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c -index f8fc042a1d..ddef228831 100644 ---- a/arch/arm/mach-tegra/board.c -+++ b/arch/arm/mach-tegra/board.c -@@ -35,7 +35,7 @@ enum { - - static bool from_spl __attribute__ ((section(".data"))); - --#ifndef CONFIG_SPL_BUILD -+#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_TEGRA210) - void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3) - { - from_spl = r0 != UBOOT_NOT_LOADED_FROM_SPL; -@@ -66,6 +66,7 @@ bool tegra_cpu_is_non_secure(void) - } - #endif - -+#if !defined(CONFIG_ARM64) - /* Read the RAM size directly from the memory controller */ - static phys_size_t query_sdram_size(void) - { -@@ -122,6 +123,7 @@ int dram_init(void) - gd->ram_size = query_sdram_size(); - return 0; - } -+#endif - - static int uart_configs[] = { - #if defined(CONFIG_TEGRA20) -diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c -index 421a71b301..22ecd99760 100644 ---- a/arch/arm/mach-tegra/board2.c -+++ b/arch/arm/mach-tegra/board2.c -@@ -171,6 +171,12 @@ int board_init(void) - return nvidia_board_init(); - } - -+void board_cleanup_before_linux(void) -+{ -+ /* power down UPHY PLL */ -+ tegra_xusb_padctl_exit(); -+} -+ - #ifdef CONFIG_BOARD_EARLY_INIT_F - static void __gpio_early_init(void) - { -@@ -220,9 +226,14 @@ int board_late_init(void) - #endif - start_cpu_fan(); - -+#if defined(CONFIG_TEGRA210) -+ tegra_soc_board_init_late(); -+#endif -+ - return 0; - } - -+#ifndef CONFIG_TEGRA210 - /* - * In some SW environments, a memory carve-out exists to house a secure - * monitor, a trusted OS, and/or various statically allocated media buffers. -@@ -348,3 +359,4 @@ ulong board_get_usable_ram_top(ulong total_size) - { - return CONFIG_SYS_SDRAM_BASE + usable_ram_size_below_4g(); - } -+#endif -diff --git a/arch/arm/mach-tegra/dt-setup.c b/arch/arm/mach-tegra/dt-setup.c -index 8ac723f41e..a961fab20f 100644 ---- a/arch/arm/mach-tegra/dt-setup.c -+++ b/arch/arm/mach-tegra/dt-setup.c -@@ -12,12 +12,10 @@ - */ - int ft_system_setup(void *blob, bd_t *bd) - { -+#if !defined(CONFIG_ARM64) - const char *gpu_compats[] = { - #if defined(CONFIG_TEGRA124) - "nvidia,gk20a", --#endif --#if defined(CONFIG_TEGRA210) -- "nvidia,gm20b", - #endif - }; - int i, ret; -@@ -28,6 +26,7 @@ int ft_system_setup(void *blob, bd_t *bd) - if (ret) - return ret; - } -+#endif - - return 0; - } -diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c -index e047f67821..3b8c1a0434 100644 ---- a/arch/arm/mach-tegra/gpu.c -+++ b/arch/arm/mach-tegra/gpu.c -@@ -17,6 +17,7 @@ static bool _configured; - - void tegra_gpu_config(void) - { -+#if !defined(CONFIG_ARM64) - struct mc_ctlr *mc = (struct mc_ctlr *)NV_PA_MC_BASE; - - #if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE) -@@ -34,6 +35,7 @@ void tegra_gpu_config(void) - debug("configured VPR\n"); - - _configured = true; -+#endif - } - - #if defined(CONFIG_OF_LIBFDT) -diff --git a/arch/arm/mach-tegra/tegra186/nvtboot_board.c b/arch/arm/mach-tegra/nvtboot_board.c -similarity index 84% -rename from arch/arm/mach-tegra/tegra186/nvtboot_board.c -rename to arch/arm/mach-tegra/nvtboot_board.c -index 83c0e931ea..7b98b502ef 100644 ---- a/arch/arm/mach-tegra/tegra186/nvtboot_board.c -+++ b/arch/arm/mach-tegra/nvtboot_board.c -@@ -5,6 +5,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -270,6 +271,27 @@ static void set_calculated_env_vars(void) - free(vars); - } - -+char *strstrip(char *s) -+{ -+ size_t size; -+ char *end; -+ -+ size = strlen(s); -+ -+ if (!size) -+ return s; -+ -+ end = s + size - 1; -+ while (end >= s && isblank(*end)) -+ end--; -+ *(end + 1) = '\0'; -+ -+ while (*s && isblank(*s)) -+ s++; -+ -+ return s; -+} -+ - static int set_fdt_addr(void) - { - int ret; -@@ -283,6 +305,7 @@ static int set_fdt_addr(void) - return 0; - } - -+#if defined(CONFIG_TEGRA186) - /* - * Attempt to use /chosen/nvidia,ether-mac in the nvtboot DTB to U-Boot's - * ethaddr environment variable if possible. -@@ -316,6 +339,49 @@ static int set_ethaddr_from_nvtboot(void) - - return 0; - } -+#endif -+ -+static int set_cbootargs(void) -+{ -+ const void *nvtboot_blob = (void *)nvtboot_boot_x0; -+ const void *prop; -+ char *bargs, *s; -+ int node, len, ret = 0; -+ -+ /* -+ * Save the bootargs passed in the DTB by the previous bootloader -+ * (CBoot) to the env. (pointer in reg x0) -+ */ -+ -+ debug("%s: nvtboot_blob = %p\n", __func__, nvtboot_blob); -+ -+ node = fdt_path_offset(nvtboot_blob, "/chosen"); -+ if (node < 0) { -+ pr_err("Can't find /chosen node in nvtboot DTB"); -+ return node; -+ } -+ debug("%s: found 'chosen' node: %d\n", __func__, node); -+ -+ prop = fdt_getprop(nvtboot_blob, node, "bootargs", &len); -+ if (!prop) { -+ pr_err("Can't find /chosen/bootargs property in nvtboot DTB"); -+ return -ENOENT; -+ } -+ debug("%s: found 'bootargs' property, len =%d\n", __func__, len); -+ -+ /* CBoot seems to add trailing whitespace - strip it here */ -+ s = strdup((char *)prop); -+ bargs = strstrip(s); -+ debug("%s: bootargs = %s!\n", __func__, bargs); -+ -+ /* Set cbootargs to env for later use by extlinux files */ -+ ret = env_set("cbootargs", bargs); -+ if (ret) -+ printf("Failed to set cbootargs from cboot DTB: %d\n", ret); -+ -+ free(s); -+ return ret; -+} - - int tegra_soc_board_init_late(void) - { -@@ -325,8 +391,12 @@ int tegra_soc_board_init_late(void) - * extlinux.conf or boot script content. - */ - set_fdt_addr(); -+#if defined(CONFIG_TEGRA186) - /* Ignore errors here; not all cases care about Ethernet addresses */ - set_ethaddr_from_nvtboot(); -+#endif -+ /* Save CBoot bootargs to env */ -+ set_cbootargs(); - - return 0; - } -diff --git a/arch/arm/mach-tegra/tegra186/nvtboot_ll.S b/arch/arm/mach-tegra/nvtboot_ll.S -similarity index 100% -rename from arch/arm/mach-tegra/tegra186/nvtboot_ll.S -rename to arch/arm/mach-tegra/nvtboot_ll.S -diff --git a/arch/arm/mach-tegra/tegra186/nvtboot_mem.c b/arch/arm/mach-tegra/nvtboot_mem.c -similarity index 100% -rename from arch/arm/mach-tegra/tegra186/nvtboot_mem.c -rename to arch/arm/mach-tegra/nvtboot_mem.c -diff --git a/arch/arm/mach-tegra/tegra186/Makefile b/arch/arm/mach-tegra/tegra186/Makefile -index 56f3378ece..1a43ef7a45 100644 ---- a/arch/arm/mach-tegra/tegra186/Makefile -+++ b/arch/arm/mach-tegra/tegra186/Makefile -@@ -4,6 +4,6 @@ - - obj-y += ../board186.o - obj-y += cache.o --obj-y += nvtboot_board.o --obj-y += nvtboot_ll.o --obj-y += nvtboot_mem.o -+obj-y += ../nvtboot_board.o -+obj-y += ../nvtboot_ll.o -+obj-y += ../nvtboot_mem.o -diff --git a/arch/arm/mach-tegra/tegra210/Makefile b/arch/arm/mach-tegra/tegra210/Makefile -index b6012fc7ba..6de6d810eb 100644 ---- a/arch/arm/mach-tegra/tegra210/Makefile -+++ b/arch/arm/mach-tegra/tegra210/Makefile -@@ -8,5 +8,8 @@ - obj-y += clock.o - obj-y += funcmux.o - obj-y += pinmux.o -+obj-y += ../nvtboot_board.o -+obj-y += ../nvtboot_ll.o -+obj-y += ../nvtboot_mem.o - obj-y += xusb-padctl.o - obj-y += ../xusb-padctl-common.o -diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c -index 06068c4b7b..341c97f16d 100644 ---- a/arch/arm/mach-tegra/tegra210/clock.c -+++ b/arch/arm/mach-tegra/tegra210/clock.c -@@ -1235,25 +1235,6 @@ int tegra_plle_enable(void) - value &= ~PLLE_SS_CNTL_INTERP_RESET; - writel(value, NV_PA_CLK_RST_BASE + PLLE_SS_CNTL); - -- /* 7. Enable HW power sequencer for PLLE */ -- -- value = readl(NV_PA_CLK_RST_BASE + PLLE_MISC); -- value &= ~PLLE_MISC_IDDQ_SWCTL; -- writel(value, NV_PA_CLK_RST_BASE + PLLE_MISC); -- -- value = readl(NV_PA_CLK_RST_BASE + PLLE_AUX); -- value &= ~PLLE_AUX_SS_SWCTL; -- value &= ~PLLE_AUX_ENABLE_SWCTL; -- value |= PLLE_AUX_SS_SEQ_INCLUDE; -- value |= PLLE_AUX_USE_LOCKDET; -- writel(value, NV_PA_CLK_RST_BASE + PLLE_AUX); -- -- /* 8. Wait 1 us */ -- -- udelay(1); -- value |= PLLE_AUX_SEQ_ENABLE; -- writel(value, NV_PA_CLK_RST_BASE + PLLE_AUX); -- - return 0; - } - -diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c -index ab6684f027..64dc297ae2 100644 ---- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c -+++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c -@@ -170,6 +170,17 @@ static int phy_unprepare(struct tegra_xusb_phy *phy) - return tegra_xusb_padctl_disable(phy->padctl); - } - -+#define XUSB_PADCTL_USB3_PAD_MUX 0x28 -+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE (1 << 0) -+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK0 (1 << 1) -+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK1 (1 << 2) -+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK2 (1 << 3) -+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK3 (1 << 4) -+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK4 (1 << 5) -+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK5 (1 << 6) -+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK6 (1 << 7) -+#define XUSB_PADCTL_USB3_PAD_MUX_FORCE_SATA_PAD_IDDQ_DISABLE_MASK0 (1 << 8) -+ - #define XUSB_PADCTL_UPHY_PLL_P0_CTL1 0x360 - #define XUSB_PADCTL_UPHY_PLL_P0_CTL1_FREQ_NDIV_MASK (0xff << 20) - #define XUSB_PADCTL_UPHY_PLL_P0_CTL1_FREQ_NDIV(x) (((x) & 0xff) << 20) -@@ -366,31 +377,6 @@ static int pcie_phy_enable(struct tegra_xusb_phy *phy) - value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL8_RCAL_CLK_EN; - padctl_writel(padctl, value, XUSB_PADCTL_UPHY_PLL_P0_CTL8); - -- value = readl(NV_PA_CLK_RST_BASE + CLK_RST_XUSBIO_PLL_CFG0); -- value &= ~CLK_RST_XUSBIO_PLL_CFG0_PADPLL_RESET_SWCTL; -- value &= ~CLK_RST_XUSBIO_PLL_CFG0_CLK_ENABLE_SWCTL; -- value |= CLK_RST_XUSBIO_PLL_CFG0_PADPLL_USE_LOCKDET; -- value |= CLK_RST_XUSBIO_PLL_CFG0_PADPLL_SLEEP_IDDQ; -- writel(value, NV_PA_CLK_RST_BASE + CLK_RST_XUSBIO_PLL_CFG0); -- -- value = padctl_readl(padctl, XUSB_PADCTL_UPHY_PLL_P0_CTL1); -- value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL1_PWR_OVRD; -- padctl_writel(padctl, value, XUSB_PADCTL_UPHY_PLL_P0_CTL1); -- -- value = padctl_readl(padctl, XUSB_PADCTL_UPHY_PLL_P0_CTL2); -- value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL2_CAL_OVRD; -- padctl_writel(padctl, value, XUSB_PADCTL_UPHY_PLL_P0_CTL2); -- -- value = padctl_readl(padctl, XUSB_PADCTL_UPHY_PLL_P0_CTL8); -- value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL8_RCAL_OVRD; -- padctl_writel(padctl, value, XUSB_PADCTL_UPHY_PLL_P0_CTL8); -- -- udelay(1); -- -- value = readl(NV_PA_CLK_RST_BASE + CLK_RST_XUSBIO_PLL_CFG0); -- value |= CLK_RST_XUSBIO_PLL_CFG0_SEQ_ENABLE; -- writel(value, NV_PA_CLK_RST_BASE + CLK_RST_XUSBIO_PLL_CFG0); -- - debug("< %s()\n", __func__); - return 0; - } -@@ -454,3 +440,35 @@ void tegra_xusb_padctl_init(void) - ret = tegra_xusb_process_nodes(nodes, count, &tegra210_socdata); - debug("%s: done, ret=%d\n", __func__, ret); - } -+ -+void tegra_xusb_padctl_exit(void) -+{ -+ u32 value; -+ -+ debug("> %s\n", __func__); -+ -+ value = padctl_readl(&padctl, XUSB_PADCTL_USB3_PAD_MUX); -+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE; -+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK0; -+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK1; -+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK2; -+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK3; -+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK4; -+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK5; -+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_PCIE_PAD_IDDQ_DISABLE_MASK6; -+ value &= ~XUSB_PADCTL_USB3_PAD_MUX_FORCE_SATA_PAD_IDDQ_DISABLE_MASK0; -+ padctl_writel(&padctl, value, XUSB_PADCTL_USB3_PAD_MUX); -+ -+ value = padctl_readl(&padctl, XUSB_PADCTL_UPHY_PLL_P0_CTL1); -+ value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL1_IDDQ; -+ value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL1_SLEEP_MASK; -+ value |= XUSB_PADCTL_UPHY_PLL_P0_CTL1_SLEEP(3); -+ value &= ~XUSB_PADCTL_UPHY_PLL_P0_CTL1_ENABLE; -+ padctl_writel(&padctl, value, XUSB_PADCTL_UPHY_PLL_P0_CTL1); -+ -+ reset_set_enable(PERIPH_ID_PEX_USB_UPHY, 1); -+ while (padctl.enable) -+ tegra_xusb_padctl_disable(&padctl); -+ -+ debug("< %s()\n", __func__); -+} -diff --git a/arch/arm/mach-tegra/xusb-padctl-dummy.c b/arch/arm/mach-tegra/xusb-padctl-dummy.c -index 3ec27a2e3a..f2d90302f6 100644 ---- a/arch/arm/mach-tegra/xusb-padctl-dummy.c -+++ b/arch/arm/mach-tegra/xusb-padctl-dummy.c -@@ -36,3 +36,7 @@ int __weak tegra_xusb_phy_unprepare(struct tegra_xusb_phy *phy) - void __weak tegra_xusb_padctl_init(void) - { - } -+ -+void __weak tegra_xusb_padctl_exit(void) -+{ -+} -diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig -index 02a7569205..d9b8be15e7 100644 ---- a/configs/p2371-0000_defconfig -+++ b/configs/p2371-0000_defconfig -@@ -1,6 +1,6 @@ - CONFIG_ARM=y - CONFIG_TEGRA=y --CONFIG_SYS_TEXT_BASE=0x80110000 -+CONFIG_SYS_TEXT_BASE=0x80080000 - CONFIG_TEGRA210=y - CONFIG_TARGET_P2371_0000=y - CONFIG_NR_DRAM_BANKS=2 -diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig -index 156a1cbcf9..602c5c1fad 100644 ---- a/configs/p2371-2180_defconfig -+++ b/configs/p2371-2180_defconfig -@@ -1,6 +1,6 @@ - CONFIG_ARM=y - CONFIG_TEGRA=y --CONFIG_SYS_TEXT_BASE=0x80110000 -+CONFIG_SYS_TEXT_BASE=0x80080000 - CONFIG_TEGRA210=y - CONFIG_TARGET_P2371_2180=y - CONFIG_NR_DRAM_BANKS=2 -diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig -index 5cbb1c3201..29929e2d99 100644 ---- a/configs/p2571_defconfig -+++ b/configs/p2571_defconfig -@@ -1,6 +1,6 @@ - CONFIG_ARM=y - CONFIG_TEGRA=y --CONFIG_SYS_TEXT_BASE=0x80110000 -+CONFIG_SYS_TEXT_BASE=0x80080000 - CONFIG_TEGRA210=y - CONFIG_TARGET_P2571=y - CONFIG_NR_DRAM_BANKS=2 --- -2.19.0.rc0 - 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/uboot-tools.spec b/uboot-tools.spec index 92f1961..a5f8520 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,33 +1,23 @@ Name: uboot-tools Version: 2018.09 -Release: 5 +Release: 6 Summary: tools for U-Boot License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ - URL: http://www.denx.de/wiki/U-Boot Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2 - Source1: arm-boards Source2: arm-chromebooks Source3: aarch64-boards Source4: aarch64-chromebooks Source5: 10-devicetree.install - -Patch1: uefi-use-specific-path-name.patch - -Patch2: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch -Patch3: usb-kbd-fixes.patch - -Patch10: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch -Patch11: rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch -Patch12: rockchip-make_fit_atf-use-elf-entry-point.patch -Patch13: rk3399-Rock960-board-support.patch -Patch14: dragonboard-fixes.patch -Patch15: tegra186-jetson-tx2-disable-onboard-emmc.patch -Patch16: tegra-efi_loader-simplify-ifdefs.patch -Patch17: tegra-TXx-Add-CONFIG_EFI_LOADER_BOUNCE_BUFFER.patch -Patch18: tegra-fix-tx1.patch -Patch19: sunxi-DT-A64-add-Pine64-LTS-support.patch +Patch0001: usb-kbd-fixes.patch +Patch0002: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch +Patch0003: rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch +Patch0004: rockchip-make_fit_atf-use-elf-entry-point.patch +Patch0005: rk3399-Rock960-board-support.patch +Patch0006: dragonboard-fixes.patch +Patch0007: tegra-efi_loader-simplify-ifdefs.patch +Patch0008: sunxi-DT-A64-add-Pine64-LTS-support.patch BuildRequires: bc dtc gcc make flex bison git-core openssl-devel BuildRequires: python-unversioned-command python2-devel python2-setuptools @@ -293,6 +283,12 @@ cp -p board/warp7/README builds/docs/README.warp7 %{_mandir}/man1/mkimage.1.gz %changelog +* Fri Jan 17 2020 Tianfei - 2018.09-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: delete patch + * Tue Jan 14 2020 openEuler Buildteam - 2018.09-5 - Type:bugfix - Id:NA diff --git a/uefi-distro-load-FDT-from-any-partition-on-boot-device.patch b/uefi-distro-load-FDT-from-any-partition-on-boot-device.patch deleted file mode 100644 index a2340fd..0000000 --- a/uefi-distro-load-FDT-from-any-partition-on-boot-device.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 8bc6f62541436ebaf87133792726d9b48f878d09 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Tue, 5 Dec 2017 00:11:08 +0000 -Subject: [PATCH] distro: load FDT from any partition on boot device - -In the EFI_LOADER boot path, we were only checking the FAT partition -containing the EFI payload for dtb files. But this is somewhat of a -fiction. In reality there will be one small (V)FAT partition containing -grub (or whatever the payload may be), and a second boot partition -containing kernel/initrd/fdt (typically ext4). It is this second -partition where we should be looking for a FDT to load. - -So instead scan all the partitions of the disk containing the EFI -payload. This matches where grub looks for kernel/initrd (barring -custom grub.cfg, in which case the user can use grub's 'devicetree' -command to load the correct FDT). - -The other option is somehow passing the ${fdtfile} to grub so that it -can load the FDT based on selected kernel version location (which grub -knows) and SoC/board specific ${fdtfile} (which grub does not know). - -Signed-off-by: Rob Clark -Signed-off-by: Peter Robinson ---- - include/config_distro_bootcmd.h | 34 +++++++++++++++++++++++----------- - 1 file changed, 23 insertions(+), 11 deletions(-) - -diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index 7746366ec8..c87f7c2a42 100644 ---- a/include/config_distro_bootcmd.h -+++ b/include/config_distro_bootcmd.h -@@ -135,25 +135,37 @@ - "fi\0" \ - \ - "load_efi_dtb=" \ -- "load ${devtype} ${devnum}:${distro_bootpart} " \ -- "${fdt_addr_r} ${prefix}${efi_fdtfile}\0" \ -+ "load ${devtype} ${devnum}:${dtb_devp} " \ -+ "${fdt_addr_r} ${prefix}${efi_fdtfile} && " \ -+ "run boot_efi_binary\0" \ - \ - "efi_dtb_prefixes=/ /dtb/ /dtb/current/\0" \ -- "scan_dev_for_efi=" \ -+ "scan_dev_for_dtb=" \ - "setenv efi_fdtfile ${fdtfile}; " \ - BOOTENV_EFI_SET_FDTFILE_FALLBACK \ -- "for prefix in ${efi_dtb_prefixes}; do " \ -- "if test -e ${devtype} " \ -- "${devnum}:${distro_bootpart} " \ -- "${prefix}${efi_fdtfile}; then " \ -- "run load_efi_dtb; " \ -- "fi;" \ -- "done;" \ -+ "part list ${devtype} ${devnum} dtb_devplist; " \ -+ "env exists dtb_devplist || setenv dtb_devplist " \ -+ "${distro_bootpart}; " \ -+ "for dtb_devp in ${dtb_devplist}; do " \ -+ "for prefix in ${efi_dtb_prefixes}; do " \ -+ "if test -e ${devtype} " \ -+ "${devnum}:${dtb_devp} " \ -+ "${prefix}${efi_fdtfile};"\ -+ " then " \ -+ "echo Found DTB ${devtype} " \ -+ "${devnum}:${dtb_devp} " \ -+ "${prefix}${efi_fdtfile};"\ -+ "run load_efi_dtb; " \ -+ "fi;" \ -+ "done; " \ -+ "done; " \ -+ "run boot_efi_binary\0" \ -+ "scan_dev_for_efi=" \ - "if test -e ${devtype} ${devnum}:${distro_bootpart} " \ - "efi/fedora/"BOOTEFI_NAME"; then " \ - "echo Found EFI removable media binary " \ - "efi/fedora/"BOOTEFI_NAME"; " \ -- "run boot_efi_binary; " \ -+ "run scan_dev_for_dtb; " \ - "echo EFI LOAD FAILED: continuing...; " \ - "fi; " \ - "setenv efi_fdtfile\0" --- -2.14.3 - diff --git a/uefi-use-specific-path-name.patch b/uefi-use-specific-path-name.patch deleted file mode 100644 index 7f61250..0000000 --- a/uefi-use-specific-path-name.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2b411f6edf298899098e2077a5ca2dfdaf3d882f Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Wed, 7 Feb 2018 12:37:58 +0000 -Subject: [PATCH] use Fedora specific EFI path/name - -Signed-off-by: Peter Robinson ---- - include/config_distro_bootcmd.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index f567cebd38..7746366ec8 100644 ---- a/include/config_distro_bootcmd.h -+++ b/include/config_distro_bootcmd.h -@@ -93,7 +93,7 @@ - - #ifdef CONFIG_EFI_LOADER - #if defined(CONFIG_ARM64) --#define BOOTEFI_NAME "bootaa64.efi" -+#define BOOTEFI_NAME "grubaa64.efi" - #elif defined(CONFIG_ARM) - #define BOOTEFI_NAME "bootarm.efi" - #elif defined(CONFIG_X86_RUN_32BIT) -@@ -127,7 +127,7 @@ - "bootefi bootmgr ${fdtcontroladdr};" \ - "fi;" \ - "load ${devtype} ${devnum}:${distro_bootpart} " \ -- "${kernel_addr_r} efi/boot/"BOOTEFI_NAME"; " \ -+ "${kernel_addr_r} efi/fedora/"BOOTEFI_NAME"; " \ - "if fdt addr ${fdt_addr_r}; then " \ - "bootefi ${kernel_addr_r} ${fdt_addr_r};" \ - "else " \ -@@ -150,9 +150,9 @@ - "fi;" \ - "done;" \ - "if test -e ${devtype} ${devnum}:${distro_bootpart} " \ -- "efi/boot/"BOOTEFI_NAME"; then " \ -+ "efi/fedora/"BOOTEFI_NAME"; then " \ - "echo Found EFI removable media binary " \ -- "efi/boot/"BOOTEFI_NAME"; " \ -+ "efi/fedora/"BOOTEFI_NAME"; " \ - "run boot_efi_binary; " \ - "echo EFI LOAD FAILED: continuing...; " \ - "fi; " \ --- -2.14.3 - -- Gitee From 41766ab936dfb9cf55d9d034ab37882adf8ec8ba Mon Sep 17 00:00:00 2001 From: wisdoman Date: Fri, 17 Jan 2020 10:30:02 +0800 Subject: [PATCH 2/2] align --- uboot-tools.spec | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/uboot-tools.spec b/uboot-tools.spec index a5f8520..8de3779 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,23 +1,23 @@ -Name: uboot-tools -Version: 2018.09 -Release: 6 -Summary: tools for U-Boot -License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ -URL: http://www.denx.de/wiki/U-Boot -Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2 -Source1: arm-boards -Source2: arm-chromebooks -Source3: aarch64-boards -Source4: aarch64-chromebooks -Source5: 10-devicetree.install -Patch0001: usb-kbd-fixes.patch -Patch0002: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch -Patch0003: rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch -Patch0004: rockchip-make_fit_atf-use-elf-entry-point.patch -Patch0005: rk3399-Rock960-board-support.patch -Patch0006: dragonboard-fixes.patch -Patch0007: tegra-efi_loader-simplify-ifdefs.patch -Patch0008: sunxi-DT-A64-add-Pine64-LTS-support.patch +Name: uboot-tools +Version: 2018.09 +Release: 6 +Summary: tools for U-Boot +License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+ +URL: http://www.denx.de/wiki/U-Boot +Source0: ftp://ftp.denx.de/pub/u-boot/u-boot-%{version}%{?candidate:-%{candidate}}.tar.bz2 +Source1: arm-boards +Source2: arm-chromebooks +Source3: aarch64-boards +Source4: aarch64-chromebooks +Source5: 10-devicetree.install +Patch0001: usb-kbd-fixes.patch +Patch0002: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch +Patch0003: rockchip-make_fit_atf-fix-warning-unit_address_vs_reg.patch +Patch0004: rockchip-make_fit_atf-use-elf-entry-point.patch +Patch0005: rk3399-Rock960-board-support.patch +Patch0006: dragonboard-fixes.patch +Patch0007: tegra-efi_loader-simplify-ifdefs.patch +Patch0008: sunxi-DT-A64-add-Pine64-LTS-support.patch BuildRequires: bc dtc gcc make flex bison git-core openssl-devel BuildRequires: python-unversioned-command python2-devel python2-setuptools @@ -303,3 +303,4 @@ cp -p board/warp7/README builds/docs/README.warp7 * Sat Oct 12 2019 openEuler Buildteam - 2018.09-3 - Package init + -- Gitee