From f0e6f489fe142fca4b1191c1307a42885b9fa96f Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Tue, 16 Mar 2021 11:19:46 +0100 Subject: v8a/imx8m: barebox: Version bump: 2020.08.1 -> 2021.02.0 This gets rid of all patches, they are included in 2020.09.0. --- configs/platform-v8a/barebox-imx8m.config | 19 ++- ...001-ARM-nxp-imx8mm-evk-always-set-up-UART.patch | 46 ----- ...ake-uart-setup-function-name-more-generic.patch | 54 ------ ...0003-ARM-i.MX8M-boards-always-set-up-UART.patch | 185 --------------------- .../0004-clk-imx8mm-fix-CPU-clock.patch | 53 ------ .../0101-Release-v2020.08.1-imx8m-20200821-1.patch | 21 --- .../platform-v8a/patches/barebox-2020.08.1/series | 14 -- configs/platform-v8a/rules/barebox-imx8m.make | 4 +- 8 files changed, 19 insertions(+), 377 deletions(-) delete mode 100644 configs/platform-v8a/patches/barebox-2020.08.1/0001-ARM-nxp-imx8mm-evk-always-set-up-UART.patch delete mode 100644 configs/platform-v8a/patches/barebox-2020.08.1/0002-ARM-imx8m-Make-uart-setup-function-name-more-generic.patch delete mode 100644 configs/platform-v8a/patches/barebox-2020.08.1/0003-ARM-i.MX8M-boards-always-set-up-UART.patch delete mode 100644 configs/platform-v8a/patches/barebox-2020.08.1/0004-clk-imx8mm-fix-CPU-clock.patch delete mode 100644 configs/platform-v8a/patches/barebox-2020.08.1/0101-Release-v2020.08.1-imx8m-20200821-1.patch delete mode 100644 configs/platform-v8a/patches/barebox-2020.08.1/series diff --git a/configs/platform-v8a/barebox-imx8m.config b/configs/platform-v8a/barebox-imx8m.config index 2f6c71d..33c992a 100644 --- a/configs/platform-v8a/barebox-imx8m.config +++ b/configs/platform-v8a/barebox-imx8m.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2020.08.1-20200821-1 Configuration +# Barebox/arm 2021.02.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -103,6 +103,7 @@ CONFIG_IMX_MULTI_BOARDS=y # CONFIG_MACH_CM_FX6 is not set # CONFIG_MACH_ADVANTECH_ROM_742X is not set # CONFIG_MACH_WARP7 is not set +# CONFIG_MACH_AC_SXB is not set # CONFIG_MACH_VF610_TWR is not set # CONFIG_MACH_ZII_RDU1 is not set # CONFIG_MACH_ZII_RDU2 is not set @@ -118,6 +119,8 @@ CONFIG_MACH_NXP_IMX8MQ_EVK=y CONFIG_MACH_PHYTEC_SOM_IMX8MQ=y # CONFIG_MACH_GRINN_LITEBOARD is not set # CONFIG_MACH_DIGI_CCIMX6ULSBCPRO is not set +# CONFIG_MACH_WEBASTO_CCBV2 is not set +# CONFIG_MACH_MNT_REFORM is not set # # Board specific settings @@ -267,6 +270,7 @@ CONFIG_POLLER=y # CONFIG_STATE is not set # CONFIG_BOOTCHOOSER is not set CONFIG_RESET_SOURCE=y +# CONFIG_SYSTEMD_OF_WATCHDOG is not set # # OP-TEE loading @@ -293,6 +297,9 @@ CONFIG_DEBUG_IMX_UART_PORT=1 # CONFIG_DEBUG_INITCALLS is not set # CONFIG_PBL_BREAK is not set # CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_CC_HAS_KASAN_GENERIC=y +# CONFIG_KASAN is not set # CONFIG_COMPILE_TEST is not set # end of Debugging @@ -321,6 +328,7 @@ CONFIG_CMD_VERSION=y # CONFIG_CMD_MMC is not set CONFIG_CMD_MMC_EXTCSD=y # CONFIG_CMD_POLLER is not set +# CONFIG_CMD_SLICE is not set # end of Information # @@ -357,6 +365,7 @@ CONFIG_CMD_PRINTENV=y CONFIG_CMD_MAGICVAR=y CONFIG_CMD_MAGICVAR_HELP=y CONFIG_CMD_SAVEENV=y +CONFIG_CMD_SETENV=y # end of Environment # @@ -436,6 +445,7 @@ CONFIG_CMD_MEMCMP=y CONFIG_CMD_MEMCPY=y CONFIG_CMD_MEMSET=y CONFIG_CMD_MEMTEST=y +# CONFIG_CMD_MEMTESTER is not set CONFIG_CMD_MM=y CONFIG_CMD_MW=y # end of Memory @@ -489,6 +499,7 @@ CONFIG_NET_RESOLV=y CONFIG_NET_IFUP=y CONFIG_NET_DHCP=y # CONFIG_NET_SNTP is not set +# CONFIG_NET_FASTBOOT is not set # # Drivers @@ -634,9 +645,10 @@ CONFIG_USB=y CONFIG_USB_HOST=y CONFIG_USB_IMX_CHIPIDEA=y CONFIG_USB_IMX_CHIPIDEA_USBMISC=y +# CONFIG_USB_DWC2_HOST is not set +# CONFIG_USB_DWC2_GADGET is not set # CONFIG_USB_DWC3 is not set # CONFIG_USB_EHCI is not set -# CONFIG_USB_DWC2_HOST is not set # CONFIG_USB_XHCI is not set # CONFIG_USB_ULPI is not set CONFIG_USB_OTGDEV=y @@ -670,6 +682,7 @@ CONFIG_MCI=y CONFIG_MCI_INFO=y CONFIG_MCI_WRITE=y CONFIG_MCI_MMC_BOOT_PARTITIONS=y +# CONFIG_MCI_MMC_GPP_PARTITIONS is not set # # --- MCI host drivers --- @@ -709,6 +722,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y # CONFIG_MFD_TWL6030 is not set CONFIG_RAVE_SP_CORE=y # CONFIG_MFD_STPMIC1 is not set +# CONFIG_MFD_ATMEL_FLEXCOM is not set # end of Multifunction device drivers # @@ -944,6 +958,7 @@ CONFIG_PRINTF_UUID=y # CONFIG_BLOBGEN is not set CONFIG_ARCH_HAS_STACK_DUMP=y CONFIG_ARCH_HAS_DATA_ABORT_MASK=y +CONFIG_ARCH_HAS_ZERO_PAGE=y # end of Library routines # diff --git a/configs/platform-v8a/patches/barebox-2020.08.1/0001-ARM-nxp-imx8mm-evk-always-set-up-UART.patch b/configs/platform-v8a/patches/barebox-2020.08.1/0001-ARM-nxp-imx8mm-evk-always-set-up-UART.patch deleted file mode 100644 index 377b2f6..0000000 --- a/configs/platform-v8a/patches/barebox-2020.08.1/0001-ARM-nxp-imx8mm-evk-always-set-up-UART.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Lucas Stach -Date: Tue, 11 Aug 2020 11:43:29 +0200 -Subject: [PATCH] ARM: nxp-imx8mm-evk: always set up UART - -When the TF-A is configured to have some output on the UART it does not -set up the UART on its own, but just expects a pre-existing configuration. -If Barebox did not set up the UART in the !DEBUG_LL case, TF-A will just -hang without any user accessible debug output, which is a very non-obvious -failure, so better be safe and always set up the UART in case TF-A wants -to use it. - -Signed-off-by: Lucas Stach -Signed-off-by: Sascha Hauer ---- - arch/arm/boards/nxp-imx8mm-evk/lowlevel.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c -index cd1f7d168bc6..082aefb8c1c5 100644 ---- a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c -+++ b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c -@@ -32,9 +32,12 @@ static void setup_uart(void) - - imx8mm_setup_pad(IMX8MM_PAD_UART2_TXD_UART2_TX | UART_PAD_CTRL); - -- imx8m_uart_setup_ll(); -+ imx8mq_uart_setup((void *)MX8M_UART2_BASE_ADDR); - -- putc_ll('>'); -+ if (IS_ENABLED(CONFIG_DEBUG_LL)) { -+ imx8m_uart_setup_ll(); -+ putc_ll('>'); -+ } - } - - static void pmic_reg_write(void *i2c, int reg, uint8_t val) -@@ -157,8 +160,7 @@ static void start_atf(void) - */ - static __noreturn noinline void nxp_imx8mm_evk_start(void) - { -- if (IS_ENABLED(CONFIG_DEBUG_LL)) -- setup_uart(); -+ setup_uart(); - - start_atf(); - diff --git a/configs/platform-v8a/patches/barebox-2020.08.1/0002-ARM-imx8m-Make-uart-setup-function-name-more-generic.patch b/configs/platform-v8a/patches/barebox-2020.08.1/0002-ARM-imx8m-Make-uart-setup-function-name-more-generic.patch deleted file mode 100644 index 4c7885a..0000000 --- a/configs/platform-v8a/patches/barebox-2020.08.1/0002-ARM-imx8m-Make-uart-setup-function-name-more-generic.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Sascha Hauer -Date: Fri, 21 Aug 2020 06:21:46 +0200 -Subject: [PATCH] ARM: imx8m: Make uart setup function name more generic - -So far all i.MX8M variants have the same UART base addresses, so let's -be optimistic that it stays like that and rename imx8mq_uart_setup() to -imx8m_uart_setup(). - -Signed-off-by: Sascha Hauer ---- - arch/arm/boards/nxp-imx8mm-evk/lowlevel.c | 2 +- - arch/arm/mach-imx/include/mach/debug_ll.h | 2 +- - include/serial/imx-uart.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c -index 082aefb8c1c5..96b78d2c6695 100644 ---- a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c -+++ b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c -@@ -32,7 +32,7 @@ static void setup_uart(void) - - imx8mm_setup_pad(IMX8MM_PAD_UART2_TXD_UART2_TX | UART_PAD_CTRL); - -- imx8mq_uart_setup((void *)MX8M_UART2_BASE_ADDR); -+ imx8m_uart_setup((void *)MX8M_UART2_BASE_ADDR); - - if (IS_ENABLED(CONFIG_DEBUG_LL)) { - imx8m_uart_setup_ll(); -diff --git a/arch/arm/mach-imx/include/mach/debug_ll.h b/arch/arm/mach-imx/include/mach/debug_ll.h -index f2114d50e91e..3217fc1c32f6 100644 ---- a/arch/arm/mach-imx/include/mach/debug_ll.h -+++ b/arch/arm/mach-imx/include/mach/debug_ll.h -@@ -105,7 +105,7 @@ static inline void imx8m_uart_setup_ll(void) - { - void *base = IOMEM(IMX_UART_BASE(IMX_DEBUG_SOC, - CONFIG_DEBUG_IMX_UART_PORT)); -- imx8mq_uart_setup(base); -+ imx8m_uart_setup(base); - } - - static inline void PUTC_LL(int c) -diff --git a/include/serial/imx-uart.h b/include/serial/imx-uart.h -index 23cee26fcfb0..c0a03ac05401 100644 ---- a/include/serial/imx-uart.h -+++ b/include/serial/imx-uart.h -@@ -201,7 +201,7 @@ static inline void imx7_uart_setup(void __iomem *uartbase) - imx_uart_setup(uartbase, 24000000); - } - --static inline void imx8mq_uart_setup(void __iomem *uartbase) -+static inline void imx8m_uart_setup(void __iomem *uartbase) - { - imx_uart_setup(uartbase, 25000000); - } diff --git a/configs/platform-v8a/patches/barebox-2020.08.1/0003-ARM-i.MX8M-boards-always-set-up-UART.patch b/configs/platform-v8a/patches/barebox-2020.08.1/0003-ARM-i.MX8M-boards-always-set-up-UART.patch deleted file mode 100644 index 77c5a40..0000000 --- a/configs/platform-v8a/patches/barebox-2020.08.1/0003-ARM-i.MX8M-boards-always-set-up-UART.patch +++ /dev/null @@ -1,185 +0,0 @@ -From: Sascha Hauer -Date: Fri, 21 Aug 2020 06:18:43 +0200 -Subject: [PATCH] ARM: i.MX8M boards: always set up UART - -Quoting Lucas on b96cc34f91 ("ARM: nxp-imx8mm-evk: always set up UART"): - -| When the TF-A is configured to have some output on the UART it does not -| set up the UART on its own, but just expects a pre-existing configuration. -| If Barebox did not set up the UART in the !DEBUG_LL case, TF-A will just -| hang without any user accessible debug output, which is a very non-obvious -| failure, so better be safe and always set up the UART in case TF-A wants -| to use it. - -This patch adopts this for all i.MX8M boards and makes the early UART -setup consistent across all of them. We also add pbl_set_putc() to -enable regular PBL console messages. For the i.MX8MM-EVK the unnecessary -call to imx8m_uart_setup_ll() is dropped; we already configured the -UART in imx8m_uart_setup(), no need to do that again. - -Signed-off-by: Sascha Hauer ---- - arch/arm/boards/nxp-imx8mm-evk/lowlevel.c | 10 +++++----- - arch/arm/boards/nxp-imx8mp-evk/lowlevel.c | 9 ++++++--- - arch/arm/boards/nxp-imx8mq-evk/lowlevel.c | 8 +++++--- - arch/arm/boards/phytec-som-imx8mq/lowlevel.c | 9 ++++++--- - arch/arm/boards/zii-imx8mq-dev/lowlevel.c | 10 ++++++---- - 5 files changed, 28 insertions(+), 18 deletions(-) - -diff --git a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c -index 96b78d2c6695..2297dc01e77f 100644 ---- a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c -+++ b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c -@@ -28,16 +28,16 @@ extern char __dtb_imx8mm_evk_start[]; - - static void setup_uart(void) - { -+ void __iomem *uart = IOMEM(MX8M_UART2_BASE_ADDR); -+ - imx8m_early_setup_uart_clock(); - - imx8mm_setup_pad(IMX8MM_PAD_UART2_TXD_UART2_TX | UART_PAD_CTRL); -+ imx8m_uart_setup(uart); - -- imx8m_uart_setup((void *)MX8M_UART2_BASE_ADDR); -+ pbl_set_putc(imx_uart_putc, uart); - -- if (IS_ENABLED(CONFIG_DEBUG_LL)) { -- imx8m_uart_setup_ll(); -- putc_ll('>'); -- } -+ putc_ll('>'); - } - - static void pmic_reg_write(void *i2c, int reg, uint8_t val) -diff --git a/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c -index 5df1ed078001..e4f994a1d1b8 100644 ---- a/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c -+++ b/arch/arm/boards/nxp-imx8mp-evk/lowlevel.c -@@ -34,11 +34,15 @@ extern char __dtb_imx8mp_evk_start[]; - - static void setup_uart(void) - { -+ void __iomem *uart = IOMEM(MX8M_UART2_BASE_ADDR); -+ - imx8m_early_setup_uart_clock(); - - imx8mp_setup_pad(MX8MP_PAD_UART2_TXD__UART2_DCE_TX | UART_PAD_CTRL); - imx8mp_setup_pad(MX8MP_PAD_UART2_RXD__UART2_DCE_RX | UART_PAD_CTRL); -- imx8m_uart_setup_ll(); -+ imx8m_uart_setup(uart); -+ -+ pbl_set_putc(imx_uart_putc, uart); - - putc_ll('>'); - } -@@ -163,8 +167,7 @@ static void start_atf(void) - */ - static __noreturn noinline void nxp_imx8mp_evk_start(void) - { -- if (IS_ENABLED(CONFIG_DEBUG_LL)) -- setup_uart(); -+ setup_uart(); - - start_atf(); - -diff --git a/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c -index 39358afad196..564621abef57 100644 ---- a/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c -+++ b/arch/arm/boards/nxp-imx8mq-evk/lowlevel.c -@@ -26,11 +26,14 @@ extern char __dtb_imx8mq_evk_start[]; - - static void setup_uart(void) - { -+ void __iomem *uart = IOMEM(MX8M_UART1_BASE_ADDR); -+ - imx8m_early_setup_uart_clock(); - - imx8mq_setup_pad(IMX8MQ_PAD_UART1_TXD__UART1_TX | UART_PAD_CTRL); -+ imx8m_uart_setup(uart); - -- imx8m_uart_setup_ll(); -+ pbl_set_putc(imx_uart_putc, uart); - - putc_ll('>'); - } -@@ -53,8 +56,7 @@ static void setup_uart(void) - */ - static __noreturn noinline void nxp_imx8mq_evk_start(void) - { -- if (IS_ENABLED(CONFIG_DEBUG_LL)) -- setup_uart(); -+ setup_uart(); - - /* - * If we are in EL3 we are running for the first time and need to -diff --git a/arch/arm/boards/phytec-som-imx8mq/lowlevel.c b/arch/arm/boards/phytec-som-imx8mq/lowlevel.c -index f5b9b6c00882..05226866f828 100644 ---- a/arch/arm/boards/phytec-som-imx8mq/lowlevel.c -+++ b/arch/arm/boards/phytec-som-imx8mq/lowlevel.c -@@ -29,11 +29,15 @@ extern char __dtb_imx8mq_phytec_phycore_som_start[]; - - static void setup_uart(void) - { -+ void __iomem *uart = IOMEM(MX8M_UART1_BASE_ADDR); -+ - imx8m_early_setup_uart_clock(); - - imx8mq_setup_pad(IMX8MQ_PAD_UART1_TXD__UART1_TX | UART_PAD_CTRL); - -- imx8m_uart_setup_ll(); -+ imx8m_uart_setup(uart); -+ -+ pbl_set_putc(imx_uart_putc, uart); - - putc_ll('>'); - } -@@ -56,8 +60,7 @@ static void phytec_imx8mq_som_sram_setup(void) - - static __noreturn noinline void phytec_phycore_imx8mq_start(void) - { -- if (IS_ENABLED(CONFIG_DEBUG_LL)) -- setup_uart(); -+ setup_uart(); - - if (get_pc() < MX8MQ_DDR_CSD1_BASE_ADDR) { - /* -diff --git a/arch/arm/boards/zii-imx8mq-dev/lowlevel.c b/arch/arm/boards/zii-imx8mq-dev/lowlevel.c -index 640083380906..311e61fb1da4 100644 ---- a/arch/arm/boards/zii-imx8mq-dev/lowlevel.c -+++ b/arch/arm/boards/zii-imx8mq-dev/lowlevel.c -@@ -28,11 +28,14 @@ - - static void setup_uart(void) - { -+ void __iomem *uart = IOMEM(MX8M_UART1_BASE_ADDR); -+ - imx8m_early_setup_uart_clock(); - - imx8mq_setup_pad(IMX8MQ_PAD_UART1_TXD__UART1_TX | UART_PAD_CTRL); -+ imx8m_uart_setup(uart); - -- imx8m_uart_setup_ll(); -+ pbl_set_putc(imx_uart_putc, uart); - - putc_ll('>'); - } -@@ -118,6 +121,8 @@ static __noreturn noinline void zii_imx8mq_dev_start(void) - unsigned int system_type; - void *fdt; - -+ setup_uart(); -+ - if (get_pc() < MX8MQ_DDR_CSD1_BASE_ADDR) { - /* - * We assume that we were just loaded by MaskROM into -@@ -194,9 +199,6 @@ ENTRY_FUNCTION(start_zii_imx8mq_dev, r0, r1, r2) - imx8mq_cpu_lowlevel_init(); - relocate_to_current_adr(); - setup_c(); -- -- if (IS_ENABLED(CONFIG_DEBUG_LL)) -- setup_uart(); - - zii_imx8mq_dev_start(); - } diff --git a/configs/platform-v8a/patches/barebox-2020.08.1/0004-clk-imx8mm-fix-CPU-clock.patch b/configs/platform-v8a/patches/barebox-2020.08.1/0004-clk-imx8mm-fix-CPU-clock.patch deleted file mode 100644 index 9d51128..0000000 --- a/configs/platform-v8a/patches/barebox-2020.08.1/0004-clk-imx8mm-fix-CPU-clock.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Lucas Stach -Date: Thu, 20 Aug 2020 21:45:47 +0200 -Subject: [PATCH] clk: imx8mm: fix CPU clock - -This is a port of the Linux kernel commit d3b70cd87e77 (clk: imx: imx8mm: -fix a53 cpu cloc). This allows the reparenting as specified in the new DTs -to succeed. - -Signed-off-by: Lucas Stach -Signed-off-by: Sascha Hauer ---- - drivers/clk/imx/clk-imx8mm.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c -index a31741af884f..17cb0177f758 100644 ---- a/drivers/clk/imx/clk-imx8mm.c -+++ b/drivers/clk/imx/clk-imx8mm.c -@@ -26,6 +26,8 @@ static const char *sys_pll3_bypass_sels[] = {"sys_pll3", "sys_pll3_ref_sel", }; - static const char *imx8mm_a53_sels[] = {"osc_24m", "arm_pll_out", "sys_pll2_500m", "sys_pll2_1000m", - "sys_pll1_800m", "sys_pll1_400m", "audio_pll1_out", "sys_pll3_out", }; - -+static const char *imx8mm_a53_core_sels[] = {"arm_a53_div", "arm_pll_out", }; -+ - static const char *imx8mm_m4_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll2_250m", "sys_pll1_266m", - "sys_pll1_800m", "audio_pll1_out", "video_pll1_out", "sys_pll3_out", }; - -@@ -396,6 +398,9 @@ static int imx8mm_clocks_init(struct device_node *ccm_np) - clks[IMX8MM_CLK_GPU3D_DIV] = imx_clk_divider2("gpu3d_div", "gpu3d_cg", ccm + 0x8180, 0, 3); - clks[IMX8MM_CLK_GPU2D_DIV] = imx_clk_divider2("gpu2d_div", "gpu2d_cg", ccm + 0x8200, 0, 3); - -+ /* CORE SEL */ -+ clks[IMX8MM_CLK_A53_CORE] = imx_clk_mux2_flags("arm_a53_core", ccm + 0x9880, 24, 1, imx8mm_a53_core_sels, ARRAY_SIZE(imx8mm_a53_core_sels), CLK_IS_CRITICAL); -+ - /* BUS */ - clks[IMX8MM_CLK_MAIN_AXI] = imx8m_clk_composite_critical("main_axi", imx8mm_main_axi_sels, ccm + 0x8800); - clks[IMX8MM_CLK_ENET_AXI] = imx8m_clk_composite("enet_axi", imx8mm_enet_axi_sels, ccm + 0x8880); -@@ -556,11 +561,11 @@ static int imx8mm_clocks_init(struct device_node *ccm_np) - clks[IMX8MM_CLK_DRAM_ALT_ROOT] = imx_clk_fixed_factor("dram_alt_root", "dram_alt", 1, 4); - clks[IMX8MM_CLK_DRAM_CORE] = imx_clk_mux2_flags("dram_core_clk", ccm + 0x9800, 24, 1, imx8mm_dram_core_sels, ARRAY_SIZE(imx8mm_dram_core_sels), CLK_IS_CRITICAL); - -- clks[IMX8MM_CLK_ARM] = imx_clk_cpu("arm", "arm_a53_div", -- clks[IMX8MM_CLK_A53_DIV], -- clks[IMX8MM_CLK_A53_SRC], -+ clks[IMX8MM_CLK_ARM] = imx_clk_cpu("arm", "arm_a53_core", -+ clks[IMX8MM_CLK_A53_CORE], -+ clks[IMX8MM_CLK_A53_CORE], - clks[IMX8MM_ARM_PLL_OUT], -- clks[IMX8MM_SYS_PLL1_800M]); -+ clks[IMX8MM_CLK_A53_DIV]); - - imx_check_clocks(clks, ARRAY_SIZE(clks)); - diff --git a/configs/platform-v8a/patches/barebox-2020.08.1/0101-Release-v2020.08.1-imx8m-20200821-1.patch b/configs/platform-v8a/patches/barebox-2020.08.1/0101-Release-v2020.08.1-imx8m-20200821-1.patch deleted file mode 100644 index e33e8e8..0000000 --- a/configs/platform-v8a/patches/barebox-2020.08.1/0101-Release-v2020.08.1-imx8m-20200821-1.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Sascha Hauer -Date: Fri, 21 Aug 2020 07:43:53 +0200 -Subject: [PATCH] Release v2020.08.1-imx8m/20200821-1 - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index d27b78201bda..d6aab4c98507 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,7 +2,7 @@ - VERSION = 2020 - PATCHLEVEL = 08 - SUBLEVEL = 1 --EXTRAVERSION = -+EXTRAVERSION =-20200821-1 - NAME = None - - # *DOCUMENTATION* diff --git a/configs/platform-v8a/patches/barebox-2020.08.1/series b/configs/platform-v8a/patches/barebox-2020.08.1/series deleted file mode 100644 index 7795aa1..0000000 --- a/configs/platform-v8a/patches/barebox-2020.08.1/series +++ /dev/null @@ -1,14 +0,0 @@ -# umpf-base: v2020.08.1 -# umpf-name: v2020.08.1-imx8m -# umpf-version: v2020.08.1-imx8m/20200821-1 -# umpf-topic: v2020.08.0/topic/imx8m -# umpf-hashinfo: f200913643b0a12af01d045261003de8bc6fc91c -# umpf-topic-range: 4dcefc03c4db34233cfa49cf48141a75d574070e..19bddd83dd34d8c5b691db298847f351f5bc652d -0001-ARM-nxp-imx8mm-evk-always-set-up-UART.patch -0002-ARM-imx8m-Make-uart-setup-function-name-more-generic.patch -0003-ARM-i.MX8M-boards-always-set-up-UART.patch -0004-clk-imx8mm-fix-CPU-clock.patch -# umpf-release: v2020.08.1-imx8m/20200821-1 -# umpf-topic-range: 19bddd83dd34d8c5b691db298847f351f5bc652d..08a8f1cc7a2d6ae1f100d721eeb697ca53889789 -0101-Release-v2020.08.1-imx8m-20200821-1.patch -# umpf-end diff --git a/configs/platform-v8a/rules/barebox-imx8m.make b/configs/platform-v8a/rules/barebox-imx8m.make index 6db8abf..f9e7d2f 100644 --- a/configs/platform-v8a/rules/barebox-imx8m.make +++ b/configs/platform-v8a/rules/barebox-imx8m.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_IMX8M) += barebox-imx8m # # Paths and names # -BAREBOX_IMX8M_VERSION := 2020.08.1 -BAREBOX_IMX8M_MD5 := d57031878390cb267f6641aedffcda9f +BAREBOX_IMX8M_VERSION := 2021.02.0 +BAREBOX_IMX8M_MD5 := 07045e34faa1135d9cd18503186b2d7f BAREBOX_IMX8M := barebox-imx8m-$(BAREBOX_IMX8M_VERSION) BAREBOX_IMX8M_SUFFIX := tar.bz2 BAREBOX_IMX8M_URL := $(call barebox-url, BAREBOX_IMX8M) -- cgit v1.2.3