diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-16 14:04:53 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-20 08:40:33 +0100 |
commit | f32f30600dd5661ee3cec04c0281f5e2d1d9deb4 (patch) | |
tree | f578b27fe7930be753d7c5b7b493605d3d23d511 /configs | |
parent | a9b5f21c5f49368a8c07b84103b281aa4b14728a (diff) | |
download | DistroKit-f32f30600dd5661ee3cec04c0281f5e2d1d9deb4.tar.gz DistroKit-f32f30600dd5661ee3cec04c0281f5e2d1d9deb4.tar.xz |
platform-v7a: barebox: version bump 2019.11.0 -> 2019.12.0DistroKit-2019.12.0
Use the latest and greatest.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'configs')
-rw-r--r-- | configs/platform-v7a/barebox-am335x-mlo.config | 3 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-am335x.config | 4 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-am335x.config.diff | 2 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-mx6.config | 4 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-mx6.config.diff | 2 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-rpi2.config | 4 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-rpi2.config.diff | 2 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-vexpress.config | 4 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-vexpress.config.diff | 2 | ||||
-rw-r--r-- | configs/platform-v7a/barebox.config | 4 | ||||
-rw-r--r-- | configs/platform-v7a/patches/barebox-2019.11.0/0001-ARM-am335x-Enable-MMC2-clock.patch | 39 | ||||
-rw-r--r-- | configs/platform-v7a/patches/barebox-2019.11.0/series | 1 | ||||
-rw-r--r-- | configs/platform-v7a/platformconfig | 4 |
13 files changed, 23 insertions, 52 deletions
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config index 7ebe984..61a8a0c 100644 --- a/configs/platform-v7a/barebox-am335x-mlo.config +++ b/configs/platform-v7a/barebox-am335x-mlo.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2019.11.0 Configuration +# Barebox/arm 2019.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_USE_COMPRESSED_DTB=y @@ -82,6 +82,7 @@ CONFIG_ARM_EXCEPTIONS=y # CONFIG_ARM_UNWIND is not set # CONFIG_ARM_SEMIHOSTING is not set # CONFIG_ARM_PSCI is not set +# CONFIG_ARM_PSCI_CLIENT is not set # end of ARM specific settings CONFIG_HAS_KALLSYMS=y diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config index 3364a81..4dc6216 100644 --- a/configs/platform-v7a/barebox-am335x.config +++ b/configs/platform-v7a/barebox-am335x.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2019.11.0 Configuration +# Barebox/arm 2019.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -87,6 +87,7 @@ CONFIG_ARM_EXCEPTIONS=y CONFIG_ARM_UNWIND=y # CONFIG_ARM_SEMIHOSTING is not set # CONFIG_ARM_PSCI is not set +# CONFIG_ARM_PSCI_CLIENT is not set # end of ARM specific settings CONFIG_HAS_KALLSYMS=y @@ -458,6 +459,7 @@ CONFIG_PHYLIB=y # CONFIG_DRIVER_NET_CALXEDA_XGMAC is not set CONFIG_DRIVER_NET_CPSW=y # CONFIG_DRIVER_NET_DESIGNWARE is not set +# CONFIG_DRIVER_NET_DESIGNWARE_EQOS is not set # CONFIG_DRIVER_NET_ENC28J60 is not set # CONFIG_DRIVER_NET_FSL_FMAN is not set # CONFIG_DRIVER_NET_KS8851_MLL is not set diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff index 7f5a889..c05292f 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -d3bb3696c8ff500f1870ffc7d17536b2 +6740c59d874d4e8459025d536717c542 # CONFIG_AM33XX_NET_BOOT is not set CONFIG_ARCH_AM33XX=y # CONFIG_ARCH_BCM283X is not set diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index 6f40930..5926735 100644 --- a/configs/platform-v7a/barebox-mx6.config +++ b/configs/platform-v7a/barebox-mx6.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2019.11.0 Configuration +# Barebox/arm 2019.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -143,6 +143,7 @@ CONFIG_ARM_EXCEPTIONS=y CONFIG_ARM_UNWIND=y # CONFIG_ARM_SEMIHOSTING is not set # CONFIG_ARM_PSCI is not set +# CONFIG_ARM_PSCI_CLIENT is not set # end of ARM specific settings CONFIG_GREGORIAN_CALENDER=y @@ -525,6 +526,7 @@ CONFIG_PHYLIB=y # CONFIG_DRIVER_NET_ARC_EMAC is not set # CONFIG_DRIVER_NET_CALXEDA_XGMAC is not set # CONFIG_DRIVER_NET_DESIGNWARE is not set +# CONFIG_DRIVER_NET_DESIGNWARE_EQOS is not set # CONFIG_DRIVER_NET_ENC28J60 is not set CONFIG_DRIVER_NET_FEC_IMX=y # CONFIG_DRIVER_NET_FSL_FMAN is not set diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff index 70305c9..29c1c48 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -d3bb3696c8ff500f1870ffc7d17536b2 +6740c59d874d4e8459025d536717c542 # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_HAS_IMX_GPT=y diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index 534fc59..0c86d6e 100644 --- a/configs/platform-v7a/barebox-rpi2.config +++ b/configs/platform-v7a/barebox-rpi2.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2019.11.0 Configuration +# Barebox/arm 2019.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -77,6 +77,7 @@ CONFIG_ARM_UNWIND=y CONFIG_ARM_SMCCC=y CONFIG_ARM_SECURE_MONITOR=y # CONFIG_ARM_PSCI is not set +# CONFIG_ARM_PSCI_CLIENT is not set # end of ARM specific settings CONFIG_GREGORIAN_CALENDER=y @@ -443,6 +444,7 @@ CONFIG_PHYLIB=y # CONFIG_DRIVER_NET_ARC_EMAC is not set # CONFIG_DRIVER_NET_CALXEDA_XGMAC is not set # CONFIG_DRIVER_NET_DESIGNWARE is not set +# CONFIG_DRIVER_NET_DESIGNWARE_EQOS is not set # CONFIG_DRIVER_NET_ENC28J60 is not set # CONFIG_DRIVER_NET_FSL_FMAN is not set # CONFIG_DRIVER_NET_KS8851_MLL is not set diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff index 81f37ab..0c24a61 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,4 +1,4 @@ -d3bb3696c8ff500f1870ffc7d17536b2 +6740c59d874d4e8459025d536717c542 CONFIG_DRIVER_SERIAL_NS16550=y # CONFIG_EEPROM_93XX46 is not set CONFIG_MACH_RPI2=y diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config index fd618b6..617fb2c 100644 --- a/configs/platform-v7a/barebox-vexpress.config +++ b/configs/platform-v7a/barebox-vexpress.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2019.11.0 Configuration +# Barebox/arm 2019.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -65,6 +65,7 @@ CONFIG_ARM_EXCEPTIONS=y CONFIG_ARM_UNWIND=y # CONFIG_ARM_SEMIHOSTING is not set # CONFIG_ARM_PSCI is not set +# CONFIG_ARM_PSCI_CLIENT is not set # end of ARM specific settings CONFIG_GREGORIAN_CALENDER=y @@ -428,6 +429,7 @@ CONFIG_PHYLIB=y # CONFIG_DRIVER_NET_ARC_EMAC is not set # CONFIG_DRIVER_NET_CALXEDA_XGMAC is not set # CONFIG_DRIVER_NET_DESIGNWARE is not set +# CONFIG_DRIVER_NET_DESIGNWARE_EQOS is not set # CONFIG_DRIVER_NET_ENC28J60 is not set # CONFIG_DRIVER_NET_FSL_FMAN is not set # CONFIG_DRIVER_NET_KS8851_MLL is not set diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff index 6a81872..840a44d 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -d3bb3696c8ff500f1870ffc7d17536b2 +6740c59d874d4e8459025d536717c542 CONFIG_AMBA_SP804=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_VEXPRESS=y diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config index b98a294..4e0d31e 100644 --- a/configs/platform-v7a/barebox.config +++ b/configs/platform-v7a/barebox.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2019.11.0 Configuration +# Barebox/arm 2019.12.0 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -77,6 +77,7 @@ CONFIG_ARM_UNWIND=y CONFIG_ARM_SMCCC=y CONFIG_ARM_SECURE_MONITOR=y # CONFIG_ARM_PSCI is not set +# CONFIG_ARM_PSCI_CLIENT is not set # end of ARM specific settings CONFIG_GREGORIAN_CALENDER=y @@ -443,6 +444,7 @@ CONFIG_PHYLIB=y # CONFIG_DRIVER_NET_ARC_EMAC is not set # CONFIG_DRIVER_NET_CALXEDA_XGMAC is not set # CONFIG_DRIVER_NET_DESIGNWARE is not set +# CONFIG_DRIVER_NET_DESIGNWARE_EQOS is not set # CONFIG_DRIVER_NET_ENC28J60 is not set # CONFIG_DRIVER_NET_FSL_FMAN is not set # CONFIG_DRIVER_NET_KS8851_MLL is not set diff --git a/configs/platform-v7a/patches/barebox-2019.11.0/0001-ARM-am335x-Enable-MMC2-clock.patch b/configs/platform-v7a/patches/barebox-2019.11.0/0001-ARM-am335x-Enable-MMC2-clock.patch deleted file mode 100644 index 4d89a1b..0000000 --- a/configs/platform-v7a/patches/barebox-2019.11.0/0001-ARM-am335x-Enable-MMC2-clock.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fb9c0086b2e3ffe2fd18a9b3f5178d14b33b9d15 Mon Sep 17 00:00:00 2001 -From: Sascha Hauer <s.hauer@pengutronix.de> -Date: Mon, 11 Nov 2019 14:20:45 +0100 -Subject: [PATCH] ARM: am335x: Enable MMC2 clock - -Since Kernel commit 5b63fb90adb9 ("ARM: dts: Fix incomplete dts data for -am3 and am4 mmc") (barebox commit 419db1f984 ("dts: update to -v5.3-rc7")) the AM33xx MMC2 controller is unconditionally enabled in the -dts. This has the effect that the driver probes for this device and then -can't access the registers as the clock is disabled. Enable the clock to -let the driver probe successfully. - -Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> ---- - arch/arm/mach-omap/am33xx_clock.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/mach-omap/am33xx_clock.c b/arch/arm/mach-omap/am33xx_clock.c -index e63e93601e..0a49038270 100644 ---- a/arch/arm/mach-omap/am33xx_clock.c -+++ b/arch/arm/mach-omap/am33xx_clock.c -@@ -142,11 +142,13 @@ void am33xx_enable_per_clocks(void) - __raw_writel(PRCM_MOD_EN, CM_PER_CPSW_CLKSTCTRL); - while ((__raw_readl(CM_PER_CPGMAC0_CLKCTRL) & 0x30000) != 0x0); - -- /* MMC 0 & 1 */ -+ /* MMC 0, 1 & 2 */ - __raw_writel(PRCM_MOD_EN, CM_PER_MMC0_CLKCTRL); - while (__raw_readl(CM_PER_MMC0_CLKCTRL) != PRCM_MOD_EN); - __raw_writel(PRCM_MOD_EN, CM_PER_MMC1_CLKCTRL); - while (__raw_readl(CM_PER_MMC1_CLKCTRL) != PRCM_MOD_EN); -+ __raw_writel(PRCM_MOD_EN, CM_PER_MMC2_CLKCTRL); -+ while (__raw_readl(CM_PER_MMC2_CLKCTRL) != PRCM_MOD_EN); - - /* Enable the control module though RBL would have done it*/ - __raw_writel(PRCM_MOD_EN, CM_WKUP_CONTROL_CLKCTRL); --- -2.24.0 - diff --git a/configs/platform-v7a/patches/barebox-2019.11.0/series b/configs/platform-v7a/patches/barebox-2019.11.0/series deleted file mode 100644 index 63c5ae1..0000000 --- a/configs/platform-v7a/patches/barebox-2019.11.0/series +++ /dev/null @@ -1 +0,0 @@ -0001-ARM-am335x-Enable-MMC2-clock.patch diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index 06c9d55..8800aab 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -166,8 +166,8 @@ PTXCONF_CONSOLE_SPEED="115200" # PTXCONF_AT91BOOTSTRAP2 is not set PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm" PTXCONF_BAREBOX_COMMON=y -PTXCONF_BAREBOX_COMMON_VERSION="2019.11.0" -PTXCONF_BAREBOX_COMMON_MD5="45bf108b22de94a73dfe5c024c873486" +PTXCONF_BAREBOX_COMMON_VERSION="2019.12.0" +PTXCONF_BAREBOX_COMMON_MD5="2d25158ccffaa843c9e4943bbe820ce2" PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AM335X_MLO=y PTXCONF_BAREBOX_AM335X=y |