Misc fixes part III
Subsystems (8)
cover Misc fixes part III
Unsorted various fixes for the barebox.
Alexander Shiyan (8):
ARM: vexpress: Simplify sysctl initialization
ARM: bcm2835: Drop uneeded headers
of: Use appropriate header for of_clk_init()
usb: gadget: Fix Kconfig dependencies
logo: Fix Kconfig dependencies
pbl: Fix Kconfig dependencies
ARM: mxs: Fix Kconfig dependencies
ARM: boards: ccmx51: Remove unused KConfig option
arch/arm/mach-bcm283x/core.c | 9 --------- arch/arm/mach-imx/Kconfig | 1 - arch/arm/mach-mxs/Kconfig | 1 + arch/arm/mach-vexpress/v2m.c | 13 +------------ drivers/of/base.c | 2 +- drivers/usb/gadget/Kconfig | 8 +++++--- lib/logo/Kconfig | 1 + pbl/Kconfig | 24 +++++++++++------------- 8 files changed, 20 insertions(+), 39 deletions(-)
Signature · 1 line
2.32.0
PATCH 1/8 ARM: vexpress: Simplify sysctl initialization
--- arch/arm/mach-vexpress/v2m.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
arch/arm/mach-vexpress/v2m.c +1 -12
@@ -5,16 +5,8 @@*/ #include <common.h> -#include <init.h> #include <io.h> - -#include <linux/clk.h> -#include <linux/clkdev.h> -#include <linux/amba/bus.h> - -#include <asm/hardware/arm_timer.h> #include <asm/hardware/sp810.h> -#include <mach/devices.h> void __iomem *v2m_sysreg_base;
@@ -23,8 +15,7 @@ static void v2m_sysctl_init(void __iomem *base) {u32 scctrl; -if (WARN_ON (!base)) -return ; + v2m_sysreg_base = base;/* Select 1MHz TIMCLK as the reference clock for SP804 timers */ scctrl =readl (base +SCCTRL );
@@ -36,13 +27,11 @@ static void v2m_sysctl_init(void __iomem *base)void vexpress_a9_legacy_init (void ) { v2m_wdt_base =IOMEM (0x1000f000 ); - v2m_sysreg_base =IOMEM (0x10001000 );v2m_sysctl_init (IOMEM (0x10001000 )); }void vexpress_init (void ) { v2m_wdt_base =IOMEM (0x1c0f0000 ); - v2m_sysreg_base =IOMEM (0x1c020000 );v2m_sysctl_init (IOMEM (0x1c020000 )); }
Signature · 1 line
2.32.0
PATCH 2/8 ARM: bcm2835: Drop uneeded headers
In reply to Alexander Shiyan--- arch/arm/mach-bcm283x/core.c | 9 --------- 1 file changed, 9 deletions(-)
arch/arm/mach-bcm283x/core.c +0 -9
@@ -17,19 +17,10 @@*/ #include <common.h> -#include <init.h> - -#include <linux/clk.h> -#include <linux/clkdev.h> -#include <linux/err.h> -#include <io.h> #include <asm/armlinux.h> #include <linux/sizes.h> - -#include <mach/platform.h> #include <mach/core.h> -#include <linux/amba/bus.h> void bcm2835_add_device_sdram (u32 size) {
Signature · 1 line
2.32.0
Re: [PATCH 2/8] ARM: bcm2835: Drop uneeded headers
Quoted 16 lines · Alexander Shiyan
Signed-off-by Alexander Shiyan <[email protected]>--- arch/arm/mach-bcm283x/core.c | 9 --------- 1 file changed, 9 deletions(-)arch/arm/mach-bcm283x/core.c +0
-3@@ -17,19 +17,10 @@*/ #include <common.h> -#include <init.h> - -#include <linux/clk.h>
arch/arm/mach-bcm283x/core.c line 32
Quoted 10 lines
arch/arm/mach-bcm283x/core.c +0
-6-#include <linux/clkdev.h> -#include <linux/err.h> -#include <io.h> #include <asm/armlinux.h> #include <linux/sizes.h> - -#include <mach/platform.h> #include <mach/core.h> -#include <linux/amba/bus.h>
This one no longer applies, the file looks completely different now. I didn't track if the content went somewhere else and the patch should be applied on another file no. If so, please resend.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH 3/8 of: Use appropriate header for of_clk_init()
In reply to Alexander Shiyan--- drivers/of/base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/of/base.c +1 -1
@@ -17,8 +17,8 @@#include <linux/sizes.h> #include <of_graph.h> #include <string.h> +#include <linux/clk.h> #include <linux/ctype.h> -#include <linux/amba/bus.h> #include <linux/err.h> static struct device_node *root_node;
Signature · 1 line
2.32.0
PATCH 4/8 usb: gadget: Fix Kconfig dependencies
In reply to Alexander ShiyanWARNING: unmet direct dependencies detected for SYSTEM_PARTITIONS Depends on [n]: GLOBALVAR [=n]
Selected by [y]:
- USB_GADGET_AUTOSTART [=y] && USB_GADGET [=y] && USB_GADGET_MASS_STORAGE [=y]
WARNING: unmet direct dependencies detected for USB_GADGET_DRIVER_ARC_PBL Depends on [n]: USB_GADGET [=n]
Selected by [y]:
- MACH_PROTONIC_IMX8M [=y] && ARCH_IMX [=y] && IMX_MULTI_BOARDS [=y]
--- drivers/usb/gadget/Kconfig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/usb/gadget/Kconfig +5 -3
@@ -4,6 +4,10 @@ menuconfig USB_GADGET select POLLER bool "USB gadget support" +config USB_GADGET_DRIVER_ARC_PBL + select USB_GADGET + bool + if USB_GADGET config USB_GADGET_DUALSPEED
@@ -16,9 +20,6 @@ config USB_GADGET_DRIVER_ARC default y select USB_GADGET_DUALSPEED -config USB_GADGET_DRIVER_ARC_PBL - bool - config USB_GADGET_DRIVER_AT91 bool prompt "at91 gadget driver"
@@ -37,6 +38,7 @@ config USB_GADGET_AUTOSTART bool default y prompt "Automatically start usbgadget on boot" + depends on GLOBALVAR select SYSTEM_PARTITIONS if USB_GADGET_MASS_STORAGE help Enabling this option allows to automatically start a dfu or
Signature · 1 line
2.32.0
Re: [PATCH 4/8] usb: gadget: Fix Kconfig dependencies
Quoted 20 lines · Alexander Shiyan
WARNING: unmet direct dependencies detected for
SYSTEM_PARTITIONSDepends on [n]: GLOBALVAR [=n]
Selected by [y]:
-USB_GADGET_AUTOSTART[=y] &&USB_GADGET[=y] &&USB_GADGET_MASS_STORAGE[=y]WARNING: unmet direct dependencies detected for
USB_GADGET_DRIVER_ARC_PBLDepends on [n]:USB_GADGET[=n]
Selected by [y]:
-MACH_PROTONIC_IMX8M[=y] &&ARCH_IMX[=y] &&IMX_MULTI_BOARDS[=y]Signed-off-by Alexander Shiyan <[email protected]>--- drivers/usb/gadget/Kconfig | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/usb/gadget/Kconfig +0
-0
drivers/usb/gadget/Kconfig menuconfig USB_GADGET · line 9
Quoted 6 lines
drivers/usb/gadget/Kconfig +3
-0@@ -4,6 +4,10 @@ menuconfig USB_GADGET select POLLER bool "USB gadget support" +config USB_GADGET_DRIVER_ARC_PBL + select USB_GADGET + bool
The "select USB_GADGET" is not necessary. The PBL part of that driver doesn't use anything from USB_GADGET.
Quoted 15 lines
drivers/usb/gadget/Kconfig +1
-3+ if USB_GADGET config USB_GADGET_DUALSPEED@@ -16,9 +20,6 @@ config USB_GADGET_DRIVER_ARC default y select USB_GADGET_DUALSPEED -config USB_GADGET_DRIVER_ARC_PBL - bool - config USB_GADGET_DRIVER_AT91 bool prompt "at91 gadget driver"
drivers/usb/gadget/Kconfig config USB_GADGET_AUTOSTART · line 41
Quoted 4 lines
drivers/usb/gadget/Kconfig +1
-0@@ -37,6 +38,7 @@ config USB_GADGET_AUTOSTART bool default y prompt "Automatically start usbgadget on boot" + depends on GLOBALVAR
Without GLOBALVAR selected the USB gadget autostart stuff can be compiled, but without any functionality, as all functionality is behind globalvars, so adding this dependency mykes sense.
drivers/usb/gadget/Kconfig config USB_GADGET_AUTOSTART · line 42
Quoted 1 line
drivers/usb/gadget/Kconfig +0
-0select SYSTEM_PARTITIONS if USB_GADGET_MASS_STORAGE
I am not sure why SYSTEM_PARTITIONS is selected here. Maybe Ahmad can comment on that. From what I can see with USB_GADGET_AUTOSTART selected without SYSTEM_PARTITIONS we still get autostart functionality, but without global.system.partitions support which seems ok.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH 4/8] usb: gadget: Fix Kconfig dependencies
Hello Sascha,
Quoted 10 lines · Sascha Hauer
Without GLOBALVAR selected the USB gadget autostart stuff can be compiled, but without any functionality, as all functionality is behind globalvars, so adding this dependency mykes sense.
Quoted 1 line
select
SYSTEM_PARTITIONSifUSB_GADGET_MASS_STORAGEI am not sure why
SYSTEM_PARTITIONSis selected here. Maybe Ahmad can comment on that. From what I can see withUSB_GADGET_AUTOSTARTselected withoutSYSTEM_PARTITIONSwe still get autostart functionality, but without global.system.partitions support which seems ok.
Instead of adding yet another gadget-specific global variable, the mass storage gadget only uses system partitions, so this select makes sense IMO.
Cheers,
Ahmad
Quoted 3 lines
Sascha
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH 4/8] usb: gadget: Fix Kconfig dependencies
Quoted 9 lines · Ahmad Fatoum
Hello Sascha,
Quoted 6 lines · Sascha Hauer
Without GLOBALVAR selected the USB gadget autostart stuff can be compiled, but without any functionality, as all functionality is behind globalvars, so adding this dependency mykes sense.
Quoted 1 line
select
SYSTEM_PARTITIONSifUSB_GADGET_MASS_STORAGE
Quoted 8 lines
Quoted 4 lines
I am not sure why
SYSTEM_PARTITIONSis selected here. Maybe Ahmad can comment on that. From what I can see withUSB_GADGET_AUTOSTARTselected withoutSYSTEM_PARTITIONSwe still get autostart functionality, but without global.system.partitions support which seems ok.Instead of adding yet another gadget-specific global variable, the mass storage gadget only uses system partitions, so this select makes sense IMO.
I would argument that USB_GADGET_AUTOSTART is functional without system partitions, and the additional support for system partitions can be manually selected by the user.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH 4/8] usb: gadget: Fix Kconfig dependencies
Hello Sascha,
Quoted 15 lines · Sascha Hauer
Quoted 14 lines · Ahmad Fatoum
Hello Sascha,
Quoted 10 lines · Sascha Hauer
Without GLOBALVAR selected the USB gadget autostart stuff can be compiled, but without any functionality, as all functionality is behind globalvars, so adding this dependency mykes sense.
Quoted 1 line
select
SYSTEM_PARTITIONSifUSB_GADGET_MASS_STORAGEI am not sure why
SYSTEM_PARTITIONSis selected here. Maybe Ahmad can comment on that. From what I can see withUSB_GADGET_AUTOSTARTselected withoutSYSTEM_PARTITIONSwe still get autostart functionality, but without global.system.partitions support which seems ok.
Quoted 7 lines
Quoted 3 lines
Instead of adding yet another gadget-specific global variable, the mass storage gadget only uses system partitions, so this select makes sense IMO.
I would argument that
USB_GADGET_AUTOSTARTis functional without system partitions, and the additional support for system partitions can be manually selected by the user.
I think it's a bit surprising to enable USB_GADGET_AUTOSTART and then see DFU and fastboot working, but not USB_GADGET_MASS_STORAGE.
If you have both USB_GADGET_MASS_STORAGE and USB_GADGET_AUTOSTART enabled, the user implicitly agrees to waste some space on them working together.
Cheers,
Ahmad
Quoted 3 lines
Sascha
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Re: [PATCH 4/8] usb: gadget: Fix Kconfig dependencies
Quoted 26 lines · Ahmad Fatoum
Hello Sascha,
Quoted 15 lines · Sascha Hauer
Quoted 14 lines · Ahmad Fatoum
Hello Sascha,
Quoted 10 lines · Sascha Hauer
Without GLOBALVAR selected the USB gadget autostart stuff can be compiled, but without any functionality, as all functionality is behind globalvars, so adding this dependency mykes sense.
Quoted 1 line
select
SYSTEM_PARTITIONSifUSB_GADGET_MASS_STORAGEI am not sure why
SYSTEM_PARTITIONSis selected here. Maybe Ahmad can comment on that. From what I can see withUSB_GADGET_AUTOSTARTselected withoutSYSTEM_PARTITIONSwe still get autostart functionality, but without global.system.partitions support which seems ok.Quoted 7 lines
Quoted 3 lines
Instead of adding yet another gadget-specific global variable, the mass storage gadget only uses system partitions, so this select makes sense IMO.
I would argument that
USB_GADGET_AUTOSTARTis functional without system partitions, and the additional support for system partitions can be manually selected by the user.
Quoted 5 lines
I think it's a bit surprising to enable
USB_GADGET_AUTOSTARTand then see DFU and fastboot working, but notUSB_GADGET_MASS_STORAGE.If you have both
USB_GADGET_MASS_STORAGEandUSB_GADGET_AUTOSTARTenabled, the user implicitly agrees to waste some space on them working together.
I was mistaken. I didn't realize that system partitions is the only way to activate USB mass storage support automatically. Ok then, applied this one with just the "select USB_GADGET" removed.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH 5/8 logo: Fix Kconfig dependencies
In reply to Alexander ShiyanWARNING: unmet direct dependencies detected for BMP Depends on [n]: IMAGE_RENDERER [=n] Selected by [y]:
- BAREBOX_LOGO_BMP [=y] && <choice>
--- lib/logo/Kconfig | 1 + 1 file changed, 1 insertion(+)
lib/logo/Kconfig +1 -0
@@ -2,6 +2,7 @@ menuconfig BAREBOX_LOGO bool "include barebox logos in build" + depends on IMAGE_RENDERER help Say yes here to build the barebox logos. This adds ImageMagick's convert tool to the build dependencies. The logo can be found under
Signature · 1 line
2.32.0
PATCH 6/8 pbl: Fix Kconfig dependencies
In reply to Alexander ShiyanWARNING: unmet direct dependencies detected for PBL_IMAGE Depends on [n]: HAVE_PBL_IMAGE [=n]
Selected by [y]:
- PBL_MULTI_IMAGES [=y] && HAVE_PBL_MULTI_IMAGES [=y]
WARNING: unmet direct dependencies detected for PBL_VERIFY_PIGGY Depends on [n]: PBL_IMAGE [=n] && ARM [=y]
Selected by [y]:
- ARCH_IMX8M [=y] && ARCH_IMX [=y] && HABV4 [=y]
WARNING: unmet direct dependencies detected for BOARD_GENERIC_DT Depends on [n]: PBL_IMAGE [=n]
Selected by [y]:
- BOARD_ARM_GENERIC_DT [=y] && HAVE_PBL_MULTI_IMAGES [=y] && OFDEVICE [=y]
--- pbl/Kconfig | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
pbl/Kconfig +11 -13
@@ -11,23 +11,29 @@ config HAVE_IMAGE_COMPRESSION config PBL_IMAGE bool "Pre-Bootloader image" - depends on HAVE_PBL_IMAGE + depends on HAVE_PBL_IMAGE || HAVE_PBL_MULTI_IMAGES + +config PBL_VERIFY_PIGGY + depends on ARM + bool + +config BOARD_GENERIC_DT + bool + select LIBFDT + +if PBL_IMAGE config PBL_MULTI_IMAGES bool - select PBL_IMAGE select PBL_RELOCATABLE depends on HAVE_PBL_MULTI_IMAGES default y config PBL_SINGLE_IMAGE bool - depends on PBL_IMAGE depends on !HAVE_PBL_MULTI_IMAGES default y -if PBL_IMAGE - config PBL_RELOCATABLE depends on ARM || MIPS || RISCV bool "relocatable pbl image"
@@ -38,14 +44,6 @@ config PBL_RELOCATABLE This option only influences the PBL image. See RELOCATABLE to also make the real image relocatable. -config PBL_VERIFY_PIGGY - depends on ARM - bool - -config BOARD_GENERIC_DT - bool - select LIBFDT - config IMAGE_COMPRESSION bool depends on HAVE_IMAGE_COMPRESSION
Signature · 1 line
2.32.0
Re: [PATCH 6/8] pbl: Fix Kconfig dependencies
Quoted 10 lines · Alexander Shiyan
WARNING: unmet direct dependencies detected for
PBL_IMAGEDepends on [n]:HAVE_PBL_IMAGE[=n]
Selected by [y]:
-PBL_MULTI_IMAGES[=y] &&HAVE_PBL_MULTI_IMAGES[=y]WARNING: unmet direct dependencies detected for
PBL_VERIFY_PIGGYDepends on [n]:PBL_IMAGE[=n] && ARM [=y]
Selected by [y]:
-ARCH_IMX8M[=y] &&ARCH_IMX[=y] && HABV4 [=y]
Quoted 4 lines
WARNING: unmet direct dependencies detected for
BOARD_GENERIC_DTDepends on [n]:PBL_IMAGE[=n]
Selected by [y]:
-BOARD_ARM_GENERIC_DT[=y] &&HAVE_PBL_MULTI_IMAGES[=y] && OFDEVICE [=y]
I had to revert this one as it breaks for example am335x_mlo_defconfig. It breaks because HAVE_PBL_MULTI_IMAGES is set. With this PBL_MULTI_IMAGES becomes enabled because it is default y. That option in turn selects PBL_IMAGE. Now with this patch applied we end up with PBL_IMAGE disabled and the config doesn't compile anymore.
I think we have to split this patch up further. What I trapped in was:
Quoted 4 lines
WARNING: unmet direct dependencies detected for
PBL_IMAGEDepends on [n]:HAVE_PBL_IMAGE[=n]
Selected by [y]:
-PBL_MULTI_IMAGES[=y] &&HAVE_PBL_MULTI_IMAGES[=y]
And I think that one could be fixed with:
config HAVE_PBL_MULTI_IMAGES
select HAVE_PBL_IMAGE
bool
Sascha
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH 7/8 ARM: mxs: Fix Kconfig dependencies
In reply to Alexander ShiyanWARNING: unmet direct dependencies detected for EEPROM_AT24 Depends on [n]: I2C [=n]
Selected by [y]:
- MACH_CFA10036 [=y] && ARCH_MXS [=y] && ARCH_IMX28 [=y]
WARNING: unmet direct dependencies detected for I2C_GPIO Depends on [n]: I2C [=n] && GENERIC_GPIO [=y] Selected by [y]:
- MACH_CFA10036 [=y] && ARCH_MXS [=y] && ARCH_IMX28 [=y]
--- arch/arm/mach-mxs/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-mxs/Kconfig +1 -0
@@ -79,6 +79,7 @@ config MACH_DUCKBILL config MACH_CFA10036 bool "cfa-10036" select MXS_OCOTP + select I2C select I2C_GPIO select EEPROM_AT24 help
Signature · 1 line
2.32.0
PATCH 8/8 ARM: boards: ccmx51: Remove unused KConfig option
In reply to Alexander ShiyanRELOCATABLE is already selected by IMX_MULTI_BOARDS
--- arch/arm/mach-imx/Kconfig | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-imx/Kconfig +0 -1
@@ -277,7 +277,6 @@ config MACH_CCMX51 select SPI select DRIVER_SPI_IMX select MFD_MC13XXX - select RELOCATABLE help Say Y here if you are using Digi ConnectCore (W)i-i.MX51 equipped with a Freescale i.MX51 Processor
Signature · 1 line
2.32.0
Sascha Hauer
AppliedQuoted 11 lines · Alexander Shiyan
Unsorted various fixes for the barebox.
Alexander Shiyan (8):
ARM: vexpress: Simplify sysctl initialization
ARM: bcm2835: Drop uneeded headers
of: Use appropriate header forof_clk_init()
usb: gadget: FixKconfigdependencies
logo: FixKconfigdependencies
pbl: FixKconfigdependencies
ARM: mxs: FixKconfigdependencies
ARM: boards: ccmx51: Remove unused KConfig option
Applied, thanks
Sascha
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |