Skip to contentSkip to conversation

Misc fixes

PATCH In review Alexander Shiyan 3 participants 9 messages Jun 1, 2022 – Jun 2, 2022

Subsystems (2)
Arm (32-bit) Arm/Microchip (AT91) SoC support
lore
Share & tools
lore

Alexander Shiyan

author
#0 lore raw

cover Misc fixes

Unsorted various fixes for the barebox.

Alexander Shiyan (5):
ARM: at91sam9n12ek: Use xz compression
ARM: boards: Fix unconditional compilation of imx51-babbage directory
drivers: soc: Fix unconditional compilation of imx directory
globalvar: Add missing empty prototype for globalvar_set()
of: Fix of_prepend_machine_compatible() defined but unused warning

 arch/arm/boards/Makefile                 | 2 +-
 arch/arm/configs/at91sam9n12ek_defconfig | 5 +----
 drivers/soc/Makefile                     | 4 ++--
 include/globalvar.h                      | 2 ++
 include/of.h                             | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)
Signature · 7 lines
2.32.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
author
#1 lore raw

PATCH 1/5 ARM: at91sam9n12ek: Use xz compression

The binary created with at91sam9n12ek_defconfig got too big over time. Use xz compression to match the bounds.

CHKFILESIZE images/start_pbl.pblb images/start_pbl.pblb size 270996 > maximum size 262144

Signed-off-by Alexander Shiyan <[email protected]>
---
 arch/arm/configs/at91sam9n12ek_defconfig | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/arm/configs/at91sam9n12ek_defconfig +1 -4
index b7c3a4b1f4..ce97ad62dc 100644
@@ -4,12 +4,12 @@ CONFIG_BAREBOX_MAX_IMAGE_SIZE=0x40000
 CONFIG_AEABI=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_PBL_IMAGE=y
+CONFIG_IMAGE_COMPRESSION_XZKERN=y
 CONFIG_MMU=y
 CONFIG_MALLOC_SIZE=0xa00000
 CONFIG_EXPERIMENTAL=y
 CONFIG_MALLOC_TLSF=y
 CONFIG_PROMPT="9G20-EK:"
-CONFIG_GLOB=y
 CONFIG_PROMPT_HUSH_PS2="y"
 CONFIG_HUSH_FANCY_PROMPT=y
 CONFIG_CMDLINE_EDITING=y

@@ -60,9 +60,6 @@ CONFIG_MTD=y
 # CONFIG_MTD_OOB_DEVICE is not set
 CONFIG_MTD_M25P80=y
 CONFIG_NAND=y
-# CONFIG_NAND_ECC_SOFT is not set
-# CONFIG_NAND_ECC_HW_SYNDROME is not set
-# CONFIG_NAND_ECC_HW_NONE is not set
 CONFIG_NAND_ATMEL=y
 CONFIG_NAND_ATMEL_PMECC=y
 CONFIG_USB_GADGET=y
Signature · 7 lines
2.32.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
author
#2 lore raw

PATCH 2/5 ARM: boards: Fix unconditional compilation of imx51-babbage directory

In reply to Alexander Shiyan
Signed-off-by Alexander Shiyan <[email protected]>
---
 arch/arm/boards/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boards/Makefile +1 -1
index d303999614..042b27a804 100644
@@ -47,7 +47,7 @@ obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD)		+= eukrea_cpuimx51/
 obj-$(CONFIG_MACH_ELTEC_HIPERCAM)		+= eltec-hipercam/
 obj-$(CONFIG_MACH_FREESCALE_MX25_3STACK)	+= freescale-mx25-3ds/
 obj-$(CONFIG_MACH_FREESCALE_MX35_3STACK)	+= freescale-mx35-3ds/
-obj-y						+= freescale-mx51-babbage/
+obj-$(CONFIG_MACH_FREESCALE_MX51_PDK)		+= freescale-mx51-babbage/
 obj-$(CONFIG_MACH_FREESCALE_MX53_LOCO)		+= freescale-mx53-qsb/
 obj-$(CONFIG_MACH_FREESCALE_MX53_SMD)		+= freescale-mx53-smd/
 obj-$(CONFIG_MACH_FREESCALE_MX53_VMX53)		+= freescale-mx53-vmx53/
Signature · 7 lines
2.32.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#3 lore raw

Re: [PATCH 2/5] ARM: boards: Fix unconditional compilation of imx51-babbage directory

Quoted 10 lines · Alexander Shiyan
Signed-off-by Alexander Shiyan <[email protected]>
---
 arch/arm/boards/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boards/Makefile +0 -0
index d303999614..042b27a804 100644

arch/arm/boards/Makefile obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += eukrea_cpuimx51/ · line 50

Quoted 5 lines
arch/arm/boards/Makefile +1 -1
@@ -47,7 +47,7 @@ obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD)		+= eukrea_cpuimx51/
 obj-$(CONFIG_MACH_ELTEC_HIPERCAM)		+= eltec-hipercam/
 obj-$(CONFIG_MACH_FREESCALE_MX25_3STACK)	+= freescale-mx25-3ds/
 obj-$(CONFIG_MACH_FREESCALE_MX35_3STACK)	+= freescale-mx35-3ds/
-obj-y						+= freescale-mx51-babbage/
+obj-$(CONFIG_MACH_FREESCALE_MX51_PDK)		+= freescale-mx51-babbage/

This change was intentional. The board code exports imx51_babbage_power_init() which is used by the zii-imx51-rdu1 board code as well.

Sascha

Signature · 9 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 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#4 lore raw

Re: [PATCH 2/5] ARM: boards: Fix unconditional compilation of imx51-babbage directory

Quoted 6 lines · Sascha Hauer
Quoted 5 lines · Alexander Shiyan
Signed-off-by Alexander Shiyan <[email protected]>
---
 arch/arm/boards/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines

arch/arm/boards/Makefile obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += eukrea_cpuimx51/ · line 50

Quoted 10 lines
arch/arm/boards/Makefile +1 -1
index d303999614..042b27a804 100644
@@ -47,7 +47,7 @@ obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD)		+= eukrea_cpuimx51/
 obj-$(CONFIG_MACH_ELTEC_HIPERCAM)		+= eltec-hipercam/
 obj-$(CONFIG_MACH_FREESCALE_MX25_3STACK)	+= freescale-mx25-3ds/
 obj-$(CONFIG_MACH_FREESCALE_MX35_3STACK)	+= freescale-mx35-3ds/
-obj-y						+= freescale-mx51-babbage/
+obj-$(CONFIG_MACH_FREESCALE_MX51_PDK)		+= freescale-mx51-babbage/

This change was intentional. The board code exports imx51_babbage_power_init() which is used by the zii-imx51-rdu1 board code as well.

FWIW, we have added common/boards/ since then, which can be used for such functions.

Cheers,
Ahmad

Quoted 3 lines

Sascha

Signature · 9 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 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
author
#5 lore raw

PATCH 3/5 drivers: soc: Fix unconditional compilation of imx directory

In reply to Alexander Shiyan

As a side change, this patch sorts entries alphabetically.

Signed-off-by Alexander Shiyan <[email protected]>
---
 drivers/soc/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/Makefile +2 -2
index e5b319e6da..a23e81ffb3 100644
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-obj-y	+= imx/
+obj-$(CONFIG_ARCH_IMX)		+= imx/
+obj-$(CONFIG_KVX)		+= kvx/
 obj-$(CONFIG_CPU_SIFIVE)	+= sifive/
 obj-$(CONFIG_SOC_STARFIVE)	+= starfive/
-obj-$(CONFIG_KVX)	+= kvx/
Signature · 7 lines
2.32.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
author
#6 lore raw

PATCH 4/5 globalvar: Add missing empty prototype for globalvar_set()

In reply to Alexander Shiyan

common/fastboot.c: In function 'cb_boot':
common/fastboot.c:396:2: error: implicit declaration of function 'globalvar_set' globalvar_set("bootm.image", "");

Signed-off-by Alexander Shiyan <[email protected]>
---
 include/globalvar.h | 2 ++
 1 file changed, 2 insertions(+)
include/globalvar.h +2 -0
index 476bb920f3..ff1da6c927 100644
@@ -101,6 +101,8 @@ static inline char *globalvar_get_match(const char *match, const char *separator
 
 static inline void globalvar_set_match(const char *match, const char *val) {}
 
+static inline void globalvar_set(const char *name, const char *val) {}
+
 static inline int nvvar_load(void)
 {
 	return 0;
Signature · 7 lines
2.32.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
author
#7 lore raw

PATCH 5/5 of: Fix of_prepend_machine_compatible() defined but unused warning

In reply to Alexander Shiyan
Signed-off-by Alexander Shiyan <[email protected]>
---
 include/of.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/of.h +1 -1
index 3a8e32f69c..46b96277d5 100644
@@ -835,7 +835,7 @@ static inline int of_autoenable_i2c_by_component(char *path)
 	return -ENODEV;
 }
 
-static int of_prepend_machine_compatible(struct device_node *root,
+static inline int of_prepend_machine_compatible(struct device_node *root,
 					 const char *compat)
 {
 	return -ENODEV;
Signature · 7 lines
2.32.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#8 lore raw
In reply to Alexander Shiyan
Quoted 8 lines · Alexander Shiyan

Unsorted various fixes for the barebox.

Alexander Shiyan (5):
ARM: at91sam9n12ek: Use xz compression
ARM: boards: Fix unconditional compilation of imx51-babbage directory
drivers: soc: Fix unconditional compilation of imx directory
globalvar: Add missing empty prototype for globalvar_set()
of: Fix of_prepend_machine_compatible() defined but unused warning

Applied 1 and 3-5, thanks

Sascha

Signature · 9 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 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox