* [DistroKit] [PATCH 00/14] Barebox Update and Cleanup
@ 2019-10-29 11:28 Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 01/14] v7a: barebox-common: modify oldconfig to affect all bareboxes Michael Olbrich
` (14 more replies)
0 siblings, 15 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:28 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
Hi,
Here are some updates for the different barebox packages. It's a version
bump to the latest release from Ahmad and various cleanups.
Most of this is basically synchronization with the latest upstream
template. This also includes a switch to out-of-tree builds, which is
useful in combination with local-src.
And there are some fixes for the package clean targets.
Regards,
Michael
Ahmad Fatoum (3):
v7a: barebox-common: modify oldconfig to affect all bareboxes
v7a: barebox-common: add clean target that affects all bareboxes
v7a: barebox: version bump 2019.08.1 → 2019.10.0
Michael Olbrich (11):
barebox-vexpress: sync with latest barebox template
barebox-mx6: sync with latest barebox template
barebox-rpi2: sync with latest barebox template
barebox-am335x-mlo: sync with latest barebox template
barebox-am335x: sync with latest barebox template
barebox-common: sync with latest barebox template
barebox-vexpress: remove installed files
barebox-rpi2: don't add a suffix to the images
barebox-am335x-mlo: actually remove images during 'clean'
barebox-am335x: actually remove images during 'clean'
barebox-mx6: actually remove images during 'clean'
.../platform-v7a/barebox-am335x-mlo.config | 8 ++-
configs/platform-v7a/barebox-am335x.config | 19 +++++-
.../platform-v7a/barebox-am335x.config.diff | 12 ++--
configs/platform-v7a/barebox-mx6.config | 16 ++++-
configs/platform-v7a/barebox-mx6.config.diff | 8 +--
configs/platform-v7a/barebox-rpi2.config | 11 +++-
configs/platform-v7a/barebox-rpi2.config.diff | 2 +-
configs/platform-v7a/barebox-vexpress.config | 11 +++-
.../platform-v7a/barebox-vexpress.config.diff | 2 +-
configs/platform-v7a/barebox.config | 11 +++-
.../platform-v7a/config/images/rpi2.config | 2 +-
.../platform-v7a/config/images/rpi3.config | 2 +-
configs/platform-v7a/platformconfig | 4 +-
.../rules/barebox-am335x-mlo.make | 41 +++++++------
.../platform-v7a/rules/barebox-am335x.make | 55 +++++++++---------
.../platform-v7a/rules/barebox-common.make | 58 ++++++++++---------
configs/platform-v7a/rules/barebox-mx6.make | 45 +++++++-------
configs/platform-v7a/rules/barebox-rpi2.make | 45 +++++++-------
.../platform-v7a/rules/barebox-vexpress.make | 51 ++++++++--------
rules/post/barebox-common.make | 22 +++++++
20 files changed, 260 insertions(+), 165 deletions(-)
create mode 100644 rules/post/barebox-common.make
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 01/14] v7a: barebox-common: modify oldconfig to affect all bareboxes
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
@ 2019-10-29 11:28 ` Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 02/14] v7a: barebox-common: add clean target that affects " Michael Olbrich
` (13 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:28 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich, Ahmad Fatoum
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
With barebox updates, oldconfig needs to be rerun for every barebox in
the BSP, to resync the configs. With this change this can be done
at once by issuing a ptxdist oldconfig barebox-common.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/rules/barebox-common.make | 5 ++++-
rules/post/barebox-common.make | 13 +++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 rules/post/barebox-common.make
diff --git a/configs/platform-v7a/rules/barebox-common.make b/configs/platform-v7a/rules/barebox-common.make
index c03c27ae0b52..84df4fe63d03 100644
--- a/configs/platform-v7a/rules/barebox-common.make
+++ b/configs/platform-v7a/rules/barebox-common.make
@@ -71,7 +71,10 @@ $(STATEDIR)/barebox-common.targetinstall:
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
-barebox-common_oldconfig barebox-common_menuconfig barebox-common_nconfig: $(STATEDIR)/barebox-common.extract
+barebox-common_menuconfig barebox-common_nconfig: $(STATEDIR)/barebox-common.extract
@$(call world/kconfig, BAREBOX_COMMON, $(subst barebox-common_,,$@))
+barebox-common_oldconfig_: $(STATEDIR)/barebox-common.extract
+ @$(call world/kconfig, BAREBOX_COMMON, oldconfig)
+
# vim: syntax=make
diff --git a/rules/post/barebox-common.make b/rules/post/barebox-common.make
new file mode 100644
index 000000000000..d78e0f1b1a83
--- /dev/null
+++ b/rules/post/barebox-common.make
@@ -0,0 +1,13 @@
+# ----------------------------------------------------------------------------
+# oldconfig
+# ----------------------------------------------------------------------------
+
+ifneq ($(filter barebox-common_oldconfig,$(MAKECMDGOALS)),)
+$(eval $(addsuffix _oldconfig,$(filter-out barebox-common, \
+ $(filter barebox-%, $(PTX_PACKAGES_SELECTED)))): barebox-common_oldconfig_$(ptx/nl))
+endif
+
+barebox-common_oldconfig: \
+ $(addsuffix _oldconfig,$(filter-out barebox-common, \
+ $(filter barebox-%, $(PTX_PACKAGES_SELECTED))))
+# vim: syntax=make
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 02/14] v7a: barebox-common: add clean target that affects all bareboxes
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 01/14] v7a: barebox-common: modify oldconfig to affect all bareboxes Michael Olbrich
@ 2019-10-29 11:28 ` Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 03/14] v7a: barebox: version bump 2019.08.1 → 2019.10.0 Michael Olbrich
` (12 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:28 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich, Ahmad Fatoum
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
Repeat what we did with barebox-common's oldconfig for clean stage as well:
Running ptxdist clean barebox-common will now clean all bareboxes.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
rules/post/barebox-common.make | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/rules/post/barebox-common.make b/rules/post/barebox-common.make
index d78e0f1b1a83..601301b1324d 100644
--- a/rules/post/barebox-common.make
+++ b/rules/post/barebox-common.make
@@ -10,4 +10,13 @@ endif
barebox-common_oldconfig: \
$(addsuffix _oldconfig,$(filter-out barebox-common, \
$(filter barebox-%, $(PTX_PACKAGES_SELECTED))))
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/barebox-common.clean: \
+ $(addprefix $(STATEDIR)/, $(addsuffix .clean, \
+ $(filter barebox-%, \ $(PTX_PACKAGES_SELECTED))))
+
# vim: syntax=make
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 03/14] v7a: barebox: version bump 2019.08.1 → 2019.10.0
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 01/14] v7a: barebox-common: modify oldconfig to affect all bareboxes Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 02/14] v7a: barebox-common: add clean target that affects " Michael Olbrich
@ 2019-10-29 11:28 ` Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 04/14] barebox-vexpress: sync with latest barebox template Michael Olbrich
` (11 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:28 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich, Ahmad Fatoum
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
There's a new barebox in town. Upgrade to it.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
.../platform-v7a/barebox-am335x-mlo.config | 8 +++++++-
configs/platform-v7a/barebox-am335x.config | 19 +++++++++++++++++--
.../platform-v7a/barebox-am335x.config.diff | 12 +++++++-----
configs/platform-v7a/barebox-mx6.config | 16 +++++++++++++++-
configs/platform-v7a/barebox-mx6.config.diff | 8 +++-----
configs/platform-v7a/barebox-rpi2.config | 11 ++++++++++-
configs/platform-v7a/barebox-rpi2.config.diff | 2 +-
configs/platform-v7a/barebox-vexpress.config | 11 ++++++++++-
.../platform-v7a/barebox-vexpress.config.diff | 2 +-
configs/platform-v7a/barebox.config | 11 ++++++++++-
configs/platform-v7a/platformconfig | 4 ++--
11 files changed, 83 insertions(+), 21 deletions(-)
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index bb75689ac100..545dba606bd4 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.08.1 Configuration
+# Barebox/arm 2019.10.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_USE_COMPRESSED_DTB=y
@@ -69,6 +69,7 @@ CONFIG_MACH_PHYTEC_SOM_AM335X=y
# CONFIG_PHYTEC_SOM_AM335X_OF_AUTOENABLE is not set
# end of OMAP Features
+# CONFIG_BOARD_ARM_GENERIC_DT is not set
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_AEABI=y
CONFIG_THUMB2_BAREBOX=y
@@ -178,6 +179,8 @@ CONFIG_DEFAULT_LOGLEVEL=7
CONFIG_DEBUG_OMAP_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_PBL_BREAK is not set
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
# end of Debugging
CONFIG_HAS_DEBUG_LL=y
@@ -246,6 +249,7 @@ CONFIG_NAND_ECC_HW=y
# CONFIG_NAND_INFO is not set
# CONFIG_NAND_BBT is not set
CONFIG_NAND_OMAP_GPMC=y
+# CONFIG_MTD_NAND_OMAP_ELM is not set
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DENALI is not set
@@ -323,6 +327,7 @@ CONFIG_CLOCKSOURCE_TI_DM=y
# Input device support
#
# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_INPUT_SPECIALKEYS is not set
# end of Input device support
# CONFIG_WATCHDOG is not set
@@ -464,6 +469,7 @@ CONFIG_XYMODEM=y
# CONFIG_BOOTSTRAP is not set
# CONFIG_NLS is not set
# CONFIG_BLOBGEN is not set
+CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
# end of Library routines
#
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index 1ffeefd6468e..6ba7c5cb36bf 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.08.1 Configuration
+# Barebox/arm 2019.10.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -72,6 +72,7 @@ CONFIG_MACH_BEAGLEBONE=y
# CONFIG_MACH_WAGO_PFC_AM35XX is not set
# end of OMAP Features
+CONFIG_BOARD_ARM_GENERIC_DT=y
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_AEABI=y
CONFIG_THUMB2_BAREBOX=y
@@ -220,6 +221,8 @@ CONFIG_DEFAULT_LOGLEVEL=6
CONFIG_DEBUG_OMAP_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_PBL_BREAK is not set
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
# end of Debugging
CONFIG_HAS_DEBUG_LL=y
@@ -429,12 +432,14 @@ CONFIG_OF_GPIO=y
CONFIG_OF_BAREBOX_DRIVERS=y
# CONFIG_OF_BAREBOX_ENV_IN_FS is not set
# CONFIG_AIODEV is not set
+CONFIG_ARM_AMBA=y
#
# serial drivers
#
# CONFIG_SERIAL_DEV_BUS is not set
# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
+# CONFIG_SERIAL_AMBA_PL011 is not set
CONFIG_DRIVER_SERIAL_NS16550=y
CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
# CONFIG_DRIVER_SERIAL_CADENCE is not set
@@ -543,6 +548,7 @@ CONFIG_NAND_READ_OOB=y
CONFIG_NAND_BBT=y
# CONFIG_NAND_ALLOW_ERASE_BAD is not set
CONFIG_NAND_OMAP_GPMC=y
+# CONFIG_MTD_NAND_OMAP_ELM is not set
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DENALI is not set
@@ -607,6 +613,7 @@ CONFIG_MCI_WRITE=y
#
# CONFIG_MCI_DW is not set
CONFIG_MCI_OMAP_HSMMC=y
+# CONFIG_MCI_MMCI is not set
# CONFIG_MCI_SPI is not set
#
@@ -632,6 +639,7 @@ CONFIG_CLOCKSOURCE_TI_DM=y
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
+# CONFIG_MFD_STPMIC1 is not set
# end of MFD
#
@@ -665,6 +673,7 @@ CONFIG_EEPROM_AT24=y
# CONFIG_KEYBOARD_GPIO is not set
# CONFIG_KEYBOARD_QT1070 is not set
# CONFIG_KEYBOARD_USB is not set
+# CONFIG_INPUT_SPECIALKEYS is not set
# end of Input device support
CONFIG_WATCHDOG=y
@@ -690,6 +699,7 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_OMAP=y
# CONFIG_GPIO_PCA953X is not set
# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_PL061 is not set
# CONFIG_GPIO_DESIGNWARE is not set
# CONFIG_GPIO_SX150X is not set
# end of GPIO
@@ -703,7 +713,9 @@ CONFIG_PINCTRL=y
CONFIG_PINCTRL_SINGLE=y
# end of Pin controllers
-# CONFIG_NVMEM is not set
+CONFIG_NVMEM=y
+# CONFIG_NVMEM_SNVS_LPGPR is not set
+# CONFIG_EEPROM_93XX46 is not set
#
# Bus devices
@@ -813,6 +825,7 @@ CONFIG_LZO_DECOMPRESS=y
CONFIG_FNMATCH=y
CONFIG_QSORT=y
CONFIG_IMAGE_SPARSE=y
+CONFIG_LIBFDT=y
# CONFIG_RATP is not set
# CONFIG_ALLOW_PRNG_FALLBACK is not set
# CONFIG_CRC_CCITT is not set
@@ -826,6 +839,8 @@ CONFIG_IMAGE_SPARSE=y
# CONFIG_BAREBOX_LOGO is not set
# CONFIG_NLS is not set
# CONFIG_BLOBGEN is not set
+CONFIG_ARCH_HAS_STACK_DUMP=y
+CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
# end of Library routines
#
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index ac11713a9abe..c2c0e9f43dc9 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,10 +1,9 @@
-8fdac5cea1dd13f3b0fbae5c0ea20c43
+f0f401a38f730b82ca95db270f8c2d48
# CONFIG_AM33XX_NET_BOOT is not set
CONFIG_ARCH_AM33XX=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_OMAP=y
# CONFIG_ARCH_TEXT_BASE is undefined
-# CONFIG_ARM_AMBA is undefined
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_ARM_BOARD_APPEND_ATAG=y
# CONFIG_ARM_BOARD_PREPEND_ATAG is not set
@@ -37,15 +36,16 @@ CONFIG_DRIVER_SERIAL_NS16550=y
CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
# CONFIG_DRIVER_SPI_FSL_QUADSPI is not set
CONFIG_DRIVER_SPI_OMAP3=y
+# CONFIG_EEPROM_93XX46 is not set
CONFIG_EEPROM_AT24=y
CONFIG_GPIO_GENERIC=y
CONFIG_GPIO_GENERIC_PLATFORM=y
CONFIG_GPIO_OMAP=y
-# CONFIG_GPIO_PL061 is undefined
# CONFIG_GREGORIAN_CALENDER is undefined
# CONFIG_HAVE_CLK is undefined
# CONFIG_I2C_MV64XXX is undefined
CONFIG_I2C_OMAP=y
+# CONFIG_I2C_STM32 is undefined
CONFIG_IMAGE_SPARSE=y
CONFIG_MACH_AFI_GF=y
# CONFIG_MACH_BEAGLE is not set
@@ -60,12 +60,13 @@ CONFIG_MACH_BEAGLEBONE=y
# CONFIG_MACH_WAGO_PFC_AM35XX is not set
# CONFIG_MCI_BCM283X is undefined
# CONFIG_MCI_BCM283X_SDHOST is undefined
-# CONFIG_MCI_MMCI is undefined
+# CONFIG_MCI_MMCI is not set
CONFIG_MCI_OMAP_HSMMC=y
CONFIG_MTD_M25P80=y
# CONFIG_MTD_NAND_DENALI is not set
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_OMAP_ELM is not set
CONFIG_MTD_SPI_NOR=y
# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
# CONFIG_MTD_SST25L is not set
@@ -81,6 +82,8 @@ CONFIG_NAND_ECC_SOFT=y
CONFIG_NAND_INFO=y
CONFIG_NAND_OMAP_GPMC=y
CONFIG_NAND_READ_OOB=y
+CONFIG_NVMEM=y
+# CONFIG_NVMEM_SNVS_LPGPR is not set
# CONFIG_OMAP_BUILD_IFT is not set
# CONFIG_OMAP_BUILD_SPI is not set
CONFIG_OMAP_GPMC=y
@@ -89,7 +92,6 @@ CONFIG_OMAP_MULTI_BOARDS=y
CONFIG_PINCTRL_SINGLE=y
CONFIG_PROMPT="barebox> "
# CONFIG_REGULATOR_BCM283X is undefined
-# CONFIG_SERIAL_AMBA_PL011 is undefined
# CONFIG_SPI_CADENCE_QUADSPI is not set
CONFIG_SPI_MEM=y
CONFIG_THUMB2_BAREBOX=y
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 2b69d0a03e69..dad7170503ac 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.08.1 Configuration
+# Barebox/arm 2019.10.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -62,6 +62,7 @@ CONFIG_RESET_IMX_SRC=y
CONFIG_ARCH_IMX6=y
CONFIG_ARCH_IMX6SX=y
CONFIG_IMX_MULTI_BOARDS=y
+# CONFIG_MACH_SCB9328 is not set
# CONFIG_MACH_TX25 is not set
# CONFIG_MACH_PCA100 is not set
# CONFIG_MACH_PCM038 is not set
@@ -127,6 +128,7 @@ CONFIG_IMX_IIM_FUSE_BLOW=y
# CONFIG_HABV4 is not set
# end of i.MX specific settings
+CONFIG_BOARD_ARM_GENERIC_DT=y
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_AEABI=y
CONFIG_THUMB2_BAREBOX=y
@@ -280,6 +282,8 @@ CONFIG_DEFAULT_LOGLEVEL=6
CONFIG_DEBUG_IMX_UART_PORT=1
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_PBL_BREAK is not set
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
# end of Debugging
CONFIG_HAS_DEBUG_LL=y
@@ -494,12 +498,14 @@ CONFIG_OF_GPIO=y
CONFIG_OF_BAREBOX_DRIVERS=y
# CONFIG_OF_BAREBOX_ENV_IN_FS is not set
# CONFIG_AIODEV is not set
+CONFIG_ARM_AMBA=y
#
# serial drivers
#
# CONFIG_SERIAL_DEV_BUS is not set
# CONFIG_DRIVER_SERIAL_ARM_DCC is not set
+# CONFIG_SERIAL_AMBA_PL011 is not set
CONFIG_DRIVER_SERIAL_IMX=y
# CONFIG_DRIVER_SERIAL_NS16550 is not set
# CONFIG_DRIVER_SERIAL_CADENCE is not set
@@ -574,6 +580,7 @@ CONFIG_I2C_GPIO=y
CONFIG_I2C_IMX=y
# CONFIG_I2C_DESIGNWARE is not set
# CONFIG_I2C_MV64XXX is not set
+# CONFIG_I2C_STM32 is not set
# end of I2C Hardware Bus support
# CONFIG_I2C_MUX is not set
@@ -706,6 +713,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y
# CONFIG_MCI_DW is not set
CONFIG_MCI_IMX_ESDHC=y
# CONFIG_MCI_IMX_ESDHC_PIO is not set
+# CONFIG_MCI_MMCI is not set
# CONFIG_MCI_SPI is not set
CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
@@ -736,6 +744,7 @@ CONFIG_CLOCKSOURCE_IMX_GPT=y
CONFIG_MFD_SYSCON=y
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
+# CONFIG_MFD_STPMIC1 is not set
# end of MFD
#
@@ -772,6 +781,7 @@ CONFIG_KEYBOARD_GPIO=y
# CONFIG_KEYBOARD_IMX_KEYPAD is not set
# CONFIG_KEYBOARD_QT1070 is not set
# CONFIG_KEYBOARD_USB is not set
+# CONFIG_INPUT_SPECIALKEYS is not set
# end of Input device support
CONFIG_WATCHDOG_IMX_RESET_SOURCE=y
@@ -799,6 +809,7 @@ CONFIG_GPIOLIB=y
CONFIG_GPIO_IMX=y
# CONFIG_GPIO_PCA953X is not set
# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_PL061 is not set
# CONFIG_GPIO_DESIGNWARE is not set
# CONFIG_GPIO_SX150X is not set
# end of GPIO
@@ -946,6 +957,7 @@ CONFIG_LIBSCAN=y
CONFIG_LIBUBIGEN=y
CONFIG_IMAGE_SPARSE=y
CONFIG_STMP_DEVICE=y
+CONFIG_LIBFDT=y
# CONFIG_RATP is not set
# CONFIG_ALLOW_PRNG_FALLBACK is not set
# CONFIG_CRC_CCITT is not set
@@ -965,6 +977,8 @@ CONFIG_LODEPNG=y
CONFIG_PRINTF_UUID=y
# CONFIG_NLS is not set
# CONFIG_BLOBGEN is not set
+CONFIG_ARCH_HAS_STACK_DUMP=y
+CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
# end of Library routines
#
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index 680ea227a491..bdfcf62400d2 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-8fdac5cea1dd13f3b0fbae5c0ea20c43
+f0f401a38f730b82ca95db270f8c2d48
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_FEC_IMX=y
CONFIG_ARCH_HAS_IMX_GPT=y
@@ -9,7 +9,6 @@ CONFIG_ARCH_IMX=y
CONFIG_ARCH_IMX_IMXIMAGE=y
# CONFIG_ARCH_IMX_USBLOADER is not set
CONFIG_ARCH_TEXT_BASE=0x4fc00000
-# CONFIG_ARM_AMBA is undefined
CONFIG_ARM_ASM_UNIFIED=y
# CONFIG_ARM_SECURE_MONITOR is undefined
# CONFIG_ARM_SMCCC is undefined
@@ -68,7 +67,6 @@ CONFIG_FS_UBIFS_COMPRESSION_LZO=y
# CONFIG_FS_UBIFS_COMPRESSION_ZLIB is not set
CONFIG_GENERIC_PHY=y
CONFIG_GPIO_IMX=y
-# CONFIG_GPIO_PL061 is undefined
# CONFIG_HABV4 is not set
# CONFIG_HWRNG is not set
CONFIG_HW_HAS_PCI=y
@@ -126,6 +124,7 @@ CONFIG_MACH_NITROGEN6=y
# CONFIG_MACH_RPI_COMMON is undefined
CONFIG_MACH_SABRELITE=y
# CONFIG_MACH_SABRESD is not set
+# CONFIG_MACH_SCB9328 is not set
# CONFIG_MACH_SOLIDRUN_MICROSOM is not set
# CONFIG_MACH_TECHNEXION_PICO_HOBBIT is not set
# CONFIG_MACH_TECHNEXION_WANDBOARD is not set
@@ -148,7 +147,7 @@ CONFIG_MACH_UDOO_NEO=y
# CONFIG_MCI_BCM283X_SDHOST is undefined
CONFIG_MCI_IMX_ESDHC=y
# CONFIG_MCI_IMX_ESDHC_PIO is not set
-# CONFIG_MCI_MMCI is undefined
+# CONFIG_MCI_MMCI is not set
CONFIG_MCI_MMC_BOOT_PARTITIONS=y
# CONFIG_MCI_STARTUP is not set
CONFIG_MFD_SYSCON=y
@@ -205,7 +204,6 @@ CONFIG_PWM_IMX=y
CONFIG_REGULATOR_FIXED=y
# CONFIG_REGULATOR_PFUZE is not set
CONFIG_RESET_IMX_SRC=y
-# CONFIG_SERIAL_AMBA_PL011 is undefined
# CONFIG_SPI_CADENCE_QUADSPI is not set
CONFIG_SPI_MEM=y
CONFIG_STMP_DEVICE=y
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 9fadd665c193..a5caee8eb73c 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.08.1 Configuration
+# Barebox/arm 2019.10.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -62,6 +62,7 @@ CONFIG_MACH_RPI3=y
# end of select Broadcom BCM283X boards to be built
CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
+CONFIG_BOARD_ARM_GENERIC_DT=y
CONFIG_AEABI=y
# CONFIG_THUMB2_BAREBOX is not set
# CONFIG_ARM_BOARD_APPEND_ATAG is not set
@@ -210,6 +211,8 @@ CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_PBL_BREAK is not set
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
# end of Debugging
CONFIG_HAS_DEBUG_LL=y
@@ -491,6 +494,7 @@ CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_GPIO=y
# CONFIG_I2C_DESIGNWARE is not set
# CONFIG_I2C_MV64XXX is not set
+# CONFIG_I2C_STM32 is not set
# end of I2C Hardware Bus support
# CONFIG_I2C_MUX is not set
@@ -600,6 +604,7 @@ CONFIG_CLOCKSOURCE_ARMV8_TIMER=y
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
+# CONFIG_MFD_STPMIC1 is not set
# end of MFD
#
@@ -633,6 +638,7 @@ CONFIG_LED_TRIGGERS=y
# CONFIG_KEYBOARD_GPIO is not set
# CONFIG_KEYBOARD_QT1070 is not set
# CONFIG_KEYBOARD_USB is not set
+# CONFIG_INPUT_SPECIALKEYS is not set
# end of Input device support
CONFIG_WATCHDOG=y
@@ -781,6 +787,7 @@ CONFIG_PROCESS_ESCAPE_SEQUENCE=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_FNMATCH=y
CONFIG_QSORT=y
+CONFIG_LIBFDT=y
# CONFIG_RATP is not set
# CONFIG_ALLOW_PRNG_FALLBACK is not set
# CONFIG_CRC_CCITT is not set
@@ -794,6 +801,8 @@ CONFIG_QSORT=y
# CONFIG_BAREBOX_LOGO is not set
# CONFIG_NLS is not set
# CONFIG_BLOBGEN is not set
+CONFIG_ARCH_HAS_STACK_DUMP=y
+CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
# end of Library routines
#
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index e322a08e22f0..6aa532a4b838 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-8fdac5cea1dd13f3b0fbae5c0ea20c43
+f0f401a38f730b82ca95db270f8c2d48
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 0fa14357bd20..388245d8817c 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.08.1 Configuration
+# Barebox/arm 2019.10.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -52,6 +52,7 @@ CONFIG_CPU_32v7=y
CONFIG_ARCH_TEXT_BASE=0x0
CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
CONFIG_MACH_VEXPRESS=y
+CONFIG_BOARD_ARM_GENERIC_DT=y
CONFIG_AEABI=y
# CONFIG_THUMB2_BAREBOX is not set
# CONFIG_ARM_BOARD_APPEND_ATAG is not set
@@ -197,6 +198,8 @@ CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_PBL_BREAK is not set
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
# end of Debugging
CONFIG_HAS_DEBUG_LL=y
@@ -472,6 +475,7 @@ CONFIG_I2C=y
#
# CONFIG_I2C_DESIGNWARE is not set
# CONFIG_I2C_MV64XXX is not set
+# CONFIG_I2C_STM32 is not set
# end of I2C Hardware Bus support
# CONFIG_I2C_MUX is not set
@@ -587,6 +591,7 @@ CONFIG_CLOCKSOURCE_ARMV8_TIMER=y
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
+# CONFIG_MFD_STPMIC1 is not set
# end of MFD
#
@@ -613,6 +618,7 @@ CONFIG_LED_TRIGGERS=y
# Input device support
#
# CONFIG_KEYBOARD_USB is not set
+# CONFIG_INPUT_SPECIALKEYS is not set
# end of Input device support
CONFIG_WATCHDOG=y
@@ -740,6 +746,7 @@ CONFIG_PROCESS_ESCAPE_SEQUENCE=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_FNMATCH=y
CONFIG_QSORT=y
+CONFIG_LIBFDT=y
# CONFIG_RATP is not set
# CONFIG_ALLOW_PRNG_FALLBACK is not set
# CONFIG_CRC_CCITT is not set
@@ -753,6 +760,8 @@ CONFIG_QSORT=y
# CONFIG_BAREBOX_LOGO is not set
# CONFIG_NLS is not set
# CONFIG_BLOBGEN is not set
+CONFIG_ARCH_HAS_STACK_DUMP=y
+CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
# end of Library routines
#
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index 9cf068124418..b49eb265d7b6 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-8fdac5cea1dd13f3b0fbae5c0ea20c43
+f0f401a38f730b82ca95db270f8c2d48
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 adbbc373824b..b2e99c91151b 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.08.1 Configuration
+# Barebox/arm 2019.10.0 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -62,6 +62,7 @@ CONFIG_MACH_RPI3=y
# end of select Broadcom BCM283X boards to be built
CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
+CONFIG_BOARD_ARM_GENERIC_DT=y
CONFIG_AEABI=y
# CONFIG_THUMB2_BAREBOX is not set
# CONFIG_ARM_BOARD_APPEND_ATAG is not set
@@ -210,6 +211,8 @@ CONFIG_DEFAULT_LOGLEVEL=6
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_PBL_BREAK is not set
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
# end of Debugging
CONFIG_HAS_DEBUG_LL=y
@@ -491,6 +494,7 @@ CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_GPIO=y
# CONFIG_I2C_DESIGNWARE is not set
# CONFIG_I2C_MV64XXX is not set
+# CONFIG_I2C_STM32 is not set
# end of I2C Hardware Bus support
# CONFIG_I2C_MUX is not set
@@ -600,6 +604,7 @@ CONFIG_CLOCKSOURCE_ARMV8_TIMER=y
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
+# CONFIG_MFD_STPMIC1 is not set
# end of MFD
#
@@ -633,6 +638,7 @@ CONFIG_LED_TRIGGERS=y
# CONFIG_KEYBOARD_GPIO is not set
# CONFIG_KEYBOARD_QT1070 is not set
# CONFIG_KEYBOARD_USB is not set
+# CONFIG_INPUT_SPECIALKEYS is not set
# end of Input device support
CONFIG_WATCHDOG=y
@@ -779,6 +785,7 @@ CONFIG_PROCESS_ESCAPE_SEQUENCE=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_FNMATCH=y
CONFIG_QSORT=y
+CONFIG_LIBFDT=y
# CONFIG_RATP is not set
# CONFIG_ALLOW_PRNG_FALLBACK is not set
# CONFIG_CRC_CCITT is not set
@@ -792,6 +799,8 @@ CONFIG_QSORT=y
# CONFIG_BAREBOX_LOGO is not set
# CONFIG_NLS is not set
# CONFIG_BLOBGEN is not set
+CONFIG_ARCH_HAS_STACK_DUMP=y
+CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
# end of Library routines
#
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index afb6d2531a0b..60681599c32a 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.08.1"
-PTXCONF_BAREBOX_COMMON_MD5="7538a4daba730b93d52fb3201c45df3e"
+PTXCONF_BAREBOX_COMMON_VERSION="2019.10.0"
+PTXCONF_BAREBOX_COMMON_MD5="ae5315916a0b493a3545e99f5e26de5c"
PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_AM335X_MLO=y
PTXCONF_BAREBOX_AM335X=y
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 04/14] barebox-vexpress: sync with latest barebox template
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
` (2 preceding siblings ...)
2019-10-29 11:28 ` [DistroKit] [PATCH 03/14] v7a: barebox: version bump 2019.08.1 → 2019.10.0 Michael Olbrich
@ 2019-10-29 11:28 ` Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 05/14] barebox-mx6: " Michael Olbrich
` (10 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:28 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
.../platform-v7a/rules/barebox-vexpress.make | 49 ++++++++++---------
1 file changed, 25 insertions(+), 24 deletions(-)
diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make
index cdf8cc178691..2007128e14da 100644
--- a/configs/platform-v7a/rules/barebox-vexpress.make
+++ b/configs/platform-v7a/rules/barebox-vexpress.make
@@ -2,8 +2,6 @@
#
# Copyright (C) 2017 by Robert Schwebel <r.schwebel@pengutronix.de>
#
-# See CREDITS for details about who has contributed to this project.
-#
# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -18,34 +16,37 @@ PACKAGES-$(PTXCONF_BAREBOX_VEXPRESS) += barebox-vexpress
#
BAREBOX_VEXPRESS_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
BAREBOX_VEXPRESS_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
-BAREBOX_VEXPRESS := barebox-$(BAREBOX_VEXPRESS_VERSION)
+BAREBOX_VEXPRESS := barebox-vexpress-$(BAREBOX_VEXPRESS_VERSION)
BAREBOX_VEXPRESS_SUFFIX := tar.bz2
-BAREBOX_VEXPRESS_DIR := $(BUILDDIR)/barebox-vexpress-$(BAREBOX_VEXPRESS_VERSION)
+BAREBOX_VEXPRESS_URL := $(call barebox-url, BAREBOX_VEXPRESS)
+BAREBOX_VEXPRESS_PATCHES := barebox-$(BAREBOX_VEXPRESS_VERSION)
+BAREBOX_VEXPRESS_SOURCE := $(SRCDIR)/$(BAREBOX_VEXPRESS_PATCHES).$(BAREBOX_VEXPRESS_SUFFIX)
+BAREBOX_VEXPRESS_DIR := $(BUILDDIR)/$(BAREBOX_VEXPRESS)
+BAREBOX_VEXPRESS_BUILD_DIR := $(BAREBOX_VEXPRESS_DIR)-build
BAREBOX_VEXPRESS_CONFIG := $(call ptx/in-platformconfigdir, barebox-vexpress.config)
BAREBOX_VEXPRESS_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_VEXPRESS_LICENSE := GPL-2.0
-BAREBOX_VEXPRESS_URL := $(call barebox-url, BAREBOX_VEXPRESS)
-BAREBOX_VEXPRESS_SOURCE := $(SRCDIR)/$(BAREBOX_VEXPRESS).$(BAREBOX_VEXPRESS_SUFFIX)
+BAREBOX_VEXPRESS_LICENSE := GPL-2.0-only
+BAREBOX_VEXPRESS_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
+# use host pkg-config for host tools
+BAREBOX_VEXPRESS_PATH := PATH=$(HOST_PATH)
+
BAREBOX_VEXPRESS_WRAPPER_BLACKLIST := \
- TARGET_HARDEN_RELRO \
- TARGET_HARDEN_BINDNOW \
- TARGET_HARDEN_PIE \
- TARGET_DEBUG \
- TARGET_BUILD_ID
+ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-BAREBOX_VEXPRESS_CONF_ENV := KCONFIG_NOTIMESTAMP=1
-BAREBOX_VEXPRESS_CONF_OPT := $(call barebox-opts, BAREBOX_VEXPRESS)
+BAREBOX_VEXPRESS_CONF_OPT := \
+ -C $(BAREBOX_VEXPRESS_DIR) \
+ O=$(BAREBOX_VEXPRESS_BUILD_DIR) \
+ $(call barebox-opts, BAREBOX_VEXPRESS)
-BAREBOX_VEXPRESS_MAKE_ENV := $(BAREBOX_VEXPRESS_CONF_ENV)
BAREBOX_VEXPRESS_MAKE_OPT := $(BAREBOX_VEXPRESS_CONF_OPT)
BAREBOX_VEXPRESS_IMAGES := images/barebox-vexpress-ca9.img
-BAREBOX_VEXPRESS_IMAGES := $(addprefix $(BAREBOX_VEXPRESS_DIR)/,$(BAREBOX_VEXPRESS_IMAGES))
+BAREBOX_VEXPRESS_IMAGES := $(addprefix $(BAREBOX_VEXPRESS_BUILD_DIR)/,$(BAREBOX_VEXPRESS_IMAGES))
ifdef PTXCONF_BAREBOX_VEXPRESS
$(BAREBOX_VEXPRESS_CONFIG):
@@ -60,10 +61,10 @@ endif
$(STATEDIR)/barebox-vexpress.prepare: $(BAREBOX_VEXPRESS_CONFIG)
@$(call targetinfo)
- @rm -f "$(BAREBOX_VEXPRESS_DIR)/.ptxdist-defaultenv"
- @ln -s "$(call ptx/in-platformconfigdir, barebox-vexpress-defaultenv)" \
- "$(BAREBOX_VEXPRESS_DIR)/.ptxdist-defaultenv"
@$(call world/prepare, BAREBOX_VEXPRESS)
+ @rm -f "$(BAREBOX_VEXPRESS_BUILD_DIR)/.ptxdist-defaultenv"
+ @ln -s "$(call ptx/in-platformconfigdir, barebox-vexpress-defaultenv)" \
+ "$(BAREBOX_VEXPRESS_BUILD_DIR)/.ptxdist-defaultenv"
@$(call touch)
# ----------------------------------------------------------------------------
@@ -75,16 +76,16 @@ $(STATEDIR)/barebox-vexpress.install:
@$(call touch)
# ----------------------------------------------------------------------------
-# Targetinstall
+# Target-Install
# ----------------------------------------------------------------------------
$(STATEDIR)/barebox-vexpress.targetinstall:
@$(call targetinfo)
@$(foreach image, $(BAREBOX_VEXPRESS_IMAGES), \
install -m 644 \
- $(image) $(IMAGEDIR)/$(notdir $(image));)
- @install -D -m644 $(BAREBOX_VEXPRESS_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-zero-env-vexpress
- @install -D -m644 $(BAREBOX_VEXPRESS_DIR)/arch/arm/dts/vexpress-v2p-ca9.dtb $(IMAGEDIR)/vexpress-v2p-ca9.dtb-bb
+ $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
+ @install -D -m644 $(BAREBOX_VEXPRESS_BUILD_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-zero-env-vexpress
+ @install -D -m644 $(BAREBOX_VEXPRESS_BUILD_DIR)/arch/arm/dts/vexpress-v2p-ca9.dtb $(IMAGEDIR)/vexpress-v2p-ca9.dtb-bb
@$(call touch)
# ----------------------------------------------------------------------------
@@ -95,7 +96,7 @@ $(STATEDIR)/barebox-vexpress.clean:
@$(call targetinfo)
@$(call clean_pkg, BAREBOX_VEXPRESS)
@$(foreach image, $(BAREBOX_VEXPRESS_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image));)
+ rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 05/14] barebox-mx6: sync with latest barebox template
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
` (3 preceding siblings ...)
2019-10-29 11:28 ` [DistroKit] [PATCH 04/14] barebox-vexpress: sync with latest barebox template Michael Olbrich
@ 2019-10-29 11:28 ` Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 06/14] barebox-rpi2: " Michael Olbrich
` (9 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:28 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/rules/barebox-mx6.make | 45 +++++++++++----------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make
index 69d823678c83..2a1cb981d796 100644
--- a/configs/platform-v7a/rules/barebox-mx6.make
+++ b/configs/platform-v7a/rules/barebox-mx6.make
@@ -2,8 +2,6 @@
#
# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
#
-# See CREDITS for details about who has contributed to this project.
-#
# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -18,30 +16,33 @@ PACKAGES-$(PTXCONF_BAREBOX_MX6) += barebox-mx6
#
BAREBOX_MX6_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
BAREBOX_MX6_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
-BAREBOX_MX6 := barebox-$(BAREBOX_MX6_VERSION)
+BAREBOX_MX6 := barebox-mx6-$(BAREBOX_MX6_VERSION)
BAREBOX_MX6_SUFFIX := tar.bz2
-BAREBOX_MX6_DIR := $(BUILDDIR)/barebox-mx6-$(BAREBOX_MX6_VERSION)
+BAREBOX_MX6_URL := $(call barebox-url, BAREBOX_MX6)
+BAREBOX_MX6_PATCHES := barebox-$(BAREBOX_MX6_VERSION)
+BAREBOX_MX6_SOURCE := $(SRCDIR)/$(BAREBOX_MX6_PATCHES).$(BAREBOX_MX6_SUFFIX)
+BAREBOX_MX6_DIR := $(BUILDDIR)/$(BAREBOX_MX6)
+BAREBOX_MX6_BUILD_DIR := $(BAREBOX_MX6_DIR)-build
BAREBOX_MX6_CONFIG := $(call ptx/in-platformconfigdir, barebox-mx6.config)
BAREBOX_MX6_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_MX6_LICENSE := GPL-2.0
-BAREBOX_MX6_URL := $(call barebox-url, BAREBOX_MX6)
-BAREBOX_MX6_SOURCE := $(SRCDIR)/$(BAREBOX_MX6).$(BAREBOX_MX6_SUFFIX)
+BAREBOX_MX6_LICENSE := GPL-2.0-only
+BAREBOX_MX6_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
+# use host pkg-config for host tools
+BAREBOX_MX6_PATH := PATH=$(HOST_PATH)
+
BAREBOX_MX6_WRAPPER_BLACKLIST := \
- TARGET_HARDEN_RELRO \
- TARGET_HARDEN_BINDNOW \
- TARGET_HARDEN_PIE \
- TARGET_DEBUG \
- TARGET_BUILD_ID
+ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-BAREBOX_MX6_CONF_ENV := KCONFIG_NOTIMESTAMP=1
-BAREBOX_MX6_CONF_OPT := $(call barebox-opts, BAREBOX_MX6)
+BAREBOX_MX6_CONF_OPT := \
+ -C $(BAREBOX_MX6_DIR) \
+ O=$(BAREBOX_MX6_BUILD_DIR) \
+ $(call barebox-opts, BAREBOX_MX6)
-BAREBOX_MX6_MAKE_ENV := $(BAREBOX_MX6_CONF_ENV)
BAREBOX_MX6_MAKE_OPT := $(BAREBOX_MX6_CONF_OPT)
BAREBOX_MX6_IMAGES := images/barebox-embest-imx6s-riotboard.img \
@@ -52,7 +53,7 @@ BAREBOX_MX6_IMAGES := images/barebox-embest-imx6s-riotboard.img \
images/barebox-boundarydevices-imx6qp-nitrogen6_max.img \
images/barebox-udoo-neo.img
-BAREBOX_MX6_IMAGES := $(addprefix $(BAREBOX_MX6_DIR)/,$(BAREBOX_MX6_IMAGES))
+BAREBOX_MX6_IMAGES := $(addprefix $(BAREBOX_MX6_BUILD_DIR)/,$(BAREBOX_MX6_IMAGES))
ifdef PTXCONF_BAREBOX_MX6
$(BAREBOX_MX6_CONFIG):
@@ -67,10 +68,10 @@ endif
$(STATEDIR)/barebox-mx6.prepare: $(BAREBOX_MX6_CONFIG)
@$(call targetinfo)
- @rm -f "$(BAREBOX_MX6_DIR)/.ptxdist-defaultenv"
- @ln -s "$(call ptx/in-platformconfigdir, barebox-mx6-defaultenv)" \
- "$(BAREBOX_MX6_DIR)/.ptxdist-defaultenv"
@$(call world/prepare, BAREBOX_MX6)
+ @rm -f "$(BAREBOX_MX6_BUILD_DIR)/.ptxdist-defaultenv"
+ @ln -s "$(call ptx/in-platformconfigdir, barebox-mx6-defaultenv)" \
+ "$(BAREBOX_MX6_BUILD_DIR)/.ptxdist-defaultenv"
@$(call touch)
# ----------------------------------------------------------------------------
@@ -82,14 +83,14 @@ $(STATEDIR)/barebox-mx6.install:
@$(call touch)
# ----------------------------------------------------------------------------
-# Targetinstall
+# Target-Install
# ----------------------------------------------------------------------------
$(STATEDIR)/barebox-mx6.targetinstall:
@$(call targetinfo)
@$(foreach image, $(BAREBOX_MX6_IMAGES), \
install -m 644 \
- $(image) $(IMAGEDIR)/$(notdir $(image));)
+ $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
@$(call touch)
# ----------------------------------------------------------------------------
@@ -100,7 +101,7 @@ $(STATEDIR)/barebox-mx6.clean:
@$(call targetinfo)
@$(call clean_pkg, BAREBOX_MX6)
@$(foreach image, $(BAREBOX_MX6_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))-mx6;)
+ rm -fv $(IMAGEDIR)/$(notdir $(image))-mx6$(ptx/nl))
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 06/14] barebox-rpi2: sync with latest barebox template
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
` (4 preceding siblings ...)
2019-10-29 11:28 ` [DistroKit] [PATCH 05/14] barebox-mx6: " Michael Olbrich
@ 2019-10-29 11:28 ` Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 07/14] barebox-am335x-mlo: " Michael Olbrich
` (8 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:28 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/rules/barebox-rpi2.make | 45 ++++++++++----------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index 97b66878a358..8f815f423db8 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -2,8 +2,6 @@
#
# Copyright (C) 2016 by Alexander Aring <aar@pengutronix.de>
#
-# See CREDITS for details about who has contributed to this project.
-#
# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -18,34 +16,37 @@ PACKAGES-$(PTXCONF_BAREBOX_RPI2) += barebox-rpi2
#
BAREBOX_RPI2_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
BAREBOX_RPI2_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
-BAREBOX_RPI2 := barebox-$(BAREBOX_RPI2_VERSION)
+BAREBOX_RPI2 := barebox-rpi2-$(BAREBOX_RPI2_VERSION)
BAREBOX_RPI2_SUFFIX := tar.bz2
-BAREBOX_RPI2_DIR := $(BUILDDIR)/barebox-rpi2-$(BAREBOX_RPI2_VERSION)
+BAREBOX_RPI2_URL := $(call barebox-url, BAREBOX_RPI2)
+BAREBOX_RPI2_PATCHES := barebox-$(BAREBOX_RPI2_VERSION)
+BAREBOX_RPI2_SOURCE := $(SRCDIR)/$(BAREBOX_RPI2_PATCHES).$(BAREBOX_RPI2_SUFFIX)
+BAREBOX_RPI2_DIR := $(BUILDDIR)/$(BAREBOX_RPI2)
+BAREBOX_RPI2_BUILD_DIR := $(BAREBOX_RPI2_DIR)-build
BAREBOX_RPI2_CONFIG := $(call ptx/in-platformconfigdir, barebox-rpi2.config)
BAREBOX_RPI2_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_RPI2_LICENSE := GPL-2.0
-BAREBOX_RPI2_URL := $(call barebox-url, BAREBOX_RPI2)
-BAREBOX_RPI2_SOURCE := $(SRCDIR)/$(BAREBOX_RPI2).$(BAREBOX_RPI2_SUFFIX)
+BAREBOX_RPI2_LICENSE := GPL-2.0-only
+BAREBOX_RPI2_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
+# use host pkg-config for host tools
+BAREBOX_RPI2_PATH := PATH=$(HOST_PATH)
+
BAREBOX_RPI2_WRAPPER_BLACKLIST := \
- TARGET_HARDEN_RELRO \
- TARGET_HARDEN_BINDNOW \
- TARGET_HARDEN_PIE \
- TARGET_DEBUG \
- TARGET_BUILD_ID
+ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-BAREBOX_RPI2_CONF_ENV := KCONFIG_NOTIMESTAMP=1
-BAREBOX_RPI2_CONF_OPT := $(call barebox-opts, BAREBOX_RPI2)
+BAREBOX_RPI2_CONF_OPT := \
+ -C $(BAREBOX_RPI2_DIR) \
+ O=$(BAREBOX_RPI2_BUILD_DIR) \
+ $(call barebox-opts, BAREBOX_RPI2)
-BAREBOX_RPI2_MAKE_ENV := $(BAREBOX_RPI2_CONF_ENV)
BAREBOX_RPI2_MAKE_OPT := $(BAREBOX_RPI2_CONF_OPT)
BAREBOX_RPI2_IMAGES := images/barebox-raspberry-pi-2.img images/barebox-raspberry-pi-3.img
-BAREBOX_RPI2_IMAGES := $(addprefix $(BAREBOX_RPI2_DIR)/,$(BAREBOX_RPI2_IMAGES))
+BAREBOX_RPI2_IMAGES := $(addprefix $(BAREBOX_RPI2_BUILD_DIR)/,$(BAREBOX_RPI2_IMAGES))
ifdef PTXCONF_BAREBOX_RPI2
$(BAREBOX_RPI2_CONFIG):
@@ -60,10 +61,10 @@ endif
$(STATEDIR)/barebox-rpi2.prepare: $(BAREBOX_RPI2_CONFIG)
@$(call targetinfo)
- @rm -f "$(BAREBOX_RPI2_DIR)/.ptxdist-defaultenv"
- @ln -s "$(call ptx/in-platformconfigdir, barebox-rpi2-defaultenv)" \
- "$(BAREBOX_RPI2_DIR)/.ptxdist-defaultenv"
@$(call world/prepare, BAREBOX_RPI2)
+ @rm -f "$(BAREBOX_RPI2_BUILD_DIR)/.ptxdist-defaultenv"
+ @ln -s "$(call ptx/in-platformconfigdir, barebox-rpi2-defaultenv)" \
+ "$(BAREBOX_RPI2_BUILD_DIR)/.ptxdist-defaultenv"
@$(call touch)
# ----------------------------------------------------------------------------
@@ -75,14 +76,14 @@ $(STATEDIR)/barebox-rpi2.install:
@$(call touch)
# ----------------------------------------------------------------------------
-# Targetinstall
+# Target-Install
# ----------------------------------------------------------------------------
$(STATEDIR)/barebox-rpi2.targetinstall:
@$(call targetinfo)
@$(foreach image, $(BAREBOX_RPI2_IMAGES), \
install -m 644 \
- $(image) $(IMAGEDIR)/$(notdir $(image))-rpi2;)
+ $(image) $(IMAGEDIR)/$(notdir $(image))-rpi2$(ptx/nl))
@$(call touch)
# ----------------------------------------------------------------------------
@@ -93,7 +94,7 @@ $(STATEDIR)/barebox-rpi2.clean:
@$(call targetinfo)
@$(call clean_pkg, BAREBOX_RPI2)
@$(foreach image, $(BAREBOX_RPI2_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image));)
+ rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 07/14] barebox-am335x-mlo: sync with latest barebox template
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
` (5 preceding siblings ...)
2019-10-29 11:28 ` [DistroKit] [PATCH 06/14] barebox-rpi2: " Michael Olbrich
@ 2019-10-29 11:28 ` Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 08/14] barebox-am335x: " Michael Olbrich
` (7 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:28 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
.../rules/barebox-am335x-mlo.make | 41 +++++++++----------
1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/configs/platform-v7a/rules/barebox-am335x-mlo.make b/configs/platform-v7a/rules/barebox-am335x-mlo.make
index 2056fc99b913..c668521a0d4c 100644
--- a/configs/platform-v7a/rules/barebox-am335x-mlo.make
+++ b/configs/platform-v7a/rules/barebox-am335x-mlo.make
@@ -2,8 +2,6 @@
#
# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
#
-# See CREDITS for details about who has contributed to this project.
-#
# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -18,34 +16,37 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X_MLO) += barebox-am335x-mlo
#
BAREBOX_AM335X_MLO_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
BAREBOX_AM335X_MLO_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
-BAREBOX_AM335X_MLO := barebox-$(BAREBOX_AM335X_MLO_VERSION)
+BAREBOX_AM335X_MLO := barebox-am335x-mlo-$(BAREBOX_AM335X_MLO_VERSION)
BAREBOX_AM335X_MLO_SUFFIX := tar.bz2
-BAREBOX_AM335X_MLO_DIR := $(BUILDDIR)/barebox-am335x-mlo-$(BAREBOX_AM335X_MLO_VERSION)
-BAREBOX_AM335X_MLO_CONFIG := $(call ptx/in-platformconfigdir, barebox-am335x-mlo.config)
-BAREBOX_AM335X_MLO_LICENSE := GPL-2.0
BAREBOX_AM335X_MLO_URL := $(call barebox-url, BAREBOX_AM335X_MLO)
-BAREBOX_AM335X_MLO_SOURCE := $(SRCDIR)/$(BAREBOX_AM335X_MLO).$(BAREBOX_AM335X_MLO_SUFFIX)
+BAREBOX_AM335X_MLO_PATCHES := barebox-$(BAREBOX_AM335X_MLO_VERSION)
+BAREBOX_AM335X_MLO_SOURCE := $(SRCDIR)/$(BAREBOX_AM335X_MLO_PATCHES).$(BAREBOX_AM335X_MLO_SUFFIX)
+BAREBOX_AM335X_MLO_DIR := $(BUILDDIR)/$(BAREBOX_AM335X_MLO)
+BAREBOX_AM335X_MLO_BUILD_DIR := $(BAREBOX_AM335X_MLO_DIR)-build
+BAREBOX_AM335X_MLO_CONFIG := $(call ptx/in-platformconfigdir, barebox-am335x-mlo.config)
+BAREBOX_AM335X_MLO_LICENSE := GPL-2.0-only
+BAREBOX_AM335X_MLO_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
+# use host pkg-config for host tools
+BAREBOX_AM335X_MLO_PATH := PATH=$(HOST_PATH)
+
BAREBOX_AM335X_MLO_WRAPPER_BLACKLIST := \
- TARGET_HARDEN_RELRO \
- TARGET_HARDEN_BINDNOW \
- TARGET_HARDEN_PIE \
- TARGET_DEBUG \
- TARGET_BUILD_ID
+ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-BAREBOX_AM335X_MLO_CONF_ENV := KCONFIG_NOTIMESTAMP=1
-BAREBOX_AM335X_MLO_CONF_OPT := $(call barebox-opts, BAREBOX_AM335X_MLO)
+BAREBOX_AM335X_MLO_CONF_OPT := \
+ -C $(BAREBOX_AM335X_MLO_DIR) \
+ O=$(BAREBOX_AM335X_MLO_BUILD_DIR) \
+ $(call barebox-opts, BAREBOX_AM335X_MLO)
-BAREBOX_AM335X_MLO_MAKE_ENV := $(BAREBOX_AM335X_MLO_CONF_ENV)
BAREBOX_AM335X_MLO_MAKE_OPT := $(BAREBOX_AM335X_MLO_CONF_OPT)
BAREBOX_AM335X_MLO_IMAGES := images/barebox-am33xx-afi-gf-mlo.img \
images/barebox-am33xx-beaglebone-mlo.img
-BAREBOX_AM335X_MLO_IMAGES := $(addprefix $(BAREBOX_AM335X_MLO_DIR)/,$(BAREBOX_AM335X_MLO_IMAGES))
+BAREBOX_AM335X_MLO_IMAGES := $(addprefix $(BAREBOX_AM335X_MLO_BUILD_DIR)/,$(BAREBOX_AM335X_MLO_IMAGES))
ifdef PTXCONF_BAREBOX_AM335X_MLO
$(BAREBOX_AM335X_MLO_CONFIG):
@@ -58,8 +59,6 @@ $(BAREBOX_AM335X_MLO_CONFIG):
@exit 1
endif
-$(STATEDIR)/barebox-am335x-mlo.prepare: $(BAREBOX_AM335X_MLO_CONFIG)
-
# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------
@@ -69,14 +68,14 @@ $(STATEDIR)/barebox-am335x-mlo.install:
@$(call touch)
# ----------------------------------------------------------------------------
-# Targetinstall
+# Target-Install
# ----------------------------------------------------------------------------
$(STATEDIR)/barebox-am335x-mlo.targetinstall:
@$(call targetinfo)
@$(foreach image, $(BAREBOX_AM335X_MLO_IMAGES), \
install -m 644 \
- $(image) $(IMAGEDIR)/$(notdir $(image));)
+ $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
@$(call touch)
# ----------------------------------------------------------------------------
@@ -87,7 +86,7 @@ $(STATEDIR)/barebox-am335x-mlo.clean:
@$(call targetinfo)
@$(call clean_pkg, BAREBOX_AM335X_MLO)
@$(foreach image, $(BAREBOX_AM335X_MLO_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x-mlo;)
+ rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x-mlo$(ptx/nl))
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 08/14] barebox-am335x: sync with latest barebox template
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
` (6 preceding siblings ...)
2019-10-29 11:28 ` [DistroKit] [PATCH 07/14] barebox-am335x-mlo: " Michael Olbrich
@ 2019-10-29 11:28 ` Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 09/14] barebox-common: " Michael Olbrich
` (6 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:28 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
.../platform-v7a/rules/barebox-am335x.make | 55 ++++++++++---------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make
index 0b9d4589f6f6..f738f34c66be 100644
--- a/configs/platform-v7a/rules/barebox-am335x.make
+++ b/configs/platform-v7a/rules/barebox-am335x.make
@@ -2,8 +2,6 @@
#
# Copyright (C) 2017 by Robert Schwebel <r.schwebel@pengutronix.de>
#
-# See CREDITS for details about who has contributed to this project.
-#
# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -16,37 +14,40 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X) += barebox-am335x
#
# Paths and names
#
-BAREBOX_AM335X_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
-BAREBOX_AM335X_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
-BAREBOX_AM335X := barebox-$(BAREBOX_AM335X_VERSION)
-BAREBOX_AM335X_SUFFIX := tar.bz2
-BAREBOX_AM335X_DIR := $(BUILDDIR)/barebox-am335x-$(BAREBOX_AM335X_VERSION)
-BAREBOX_AM335X_CONFIG := $(call ptx/in-platformconfigdir, barebox-am335x.config)
-BAREBOX_AM335X_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_AM335X_LICENSE := GPL-2.0
-BAREBOX_AM335X_URL := $(call barebox-url, BAREBOX_AM335X)
-BAREBOX_AM335X_SOURCE := $(SRCDIR)/$(BAREBOX_AM335X).$(BAREBOX_AM335X_SUFFIX)
+BAREBOX_AM335X_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
+BAREBOX_AM335X_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
+BAREBOX_AM335X := barebox-am335x-$(BAREBOX_AM335X_VERSION)
+BAREBOX_AM335X_SUFFIX := tar.bz2
+BAREBOX_AM335X_URL := $(call barebox-url, BAREBOX_AM335X)
+BAREBOX_AM335X_PATCHES := barebox-$(BAREBOX_AM335X_VERSION)
+BAREBOX_AM335X_SOURCE := $(SRCDIR)/$(BAREBOX_AM335X_PATCHES).$(BAREBOX_AM335X_SUFFIX)
+BAREBOX_AM335X_DIR := $(BUILDDIR)/$(BAREBOX_AM335X)
+BAREBOX_AM335X_BUILD_DIR := $(BAREBOX_AM335X_DIR)-build
+BAREBOX_AM335X_CONFIG := $(call ptx/in-platformconfigdir, barebox-am335x.config)
+BAREBOX_AM335X_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_AM335X_LICENSE := GPL-2.0-only
+BAREBOX_AM335X_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
+# use host pkg-config for host tools
+BAREBOX_AM335X_PATH := PATH=$(HOST_PATH)
+
BAREBOX_AM335X_WRAPPER_BLACKLIST := \
- TARGET_HARDEN_RELRO \
- TARGET_HARDEN_BINDNOW \
- TARGET_HARDEN_PIE \
- TARGET_DEBUG \
- TARGET_BUILD_ID
+ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-BAREBOX_AM335X_CONF_ENV := KCONFIG_NOTIMESTAMP=1
-BAREBOX_AM335X_CONF_OPT := $(call barebox-opts, BAREBOX_AM335X)
+BAREBOX_AM335X_CONF_OPT := \
+ -C $(BAREBOX_AM335X_DIR) \
+ O=$(BAREBOX_AM335X_BUILD_DIR) \
+ $(call barebox-opts, BAREBOX_AM335X)
-BAREBOX_AM335X_MAKE_ENV := $(BAREBOX_AM335X_CONF_ENV)
BAREBOX_AM335X_MAKE_OPT := $(BAREBOX_AM335X_CONF_OPT)
BAREBOX_AM335X_IMAGES := images/barebox-am33xx-afi-gf.img \
images/barebox-am33xx-beaglebone.img
-BAREBOX_AM335X_IMAGES := $(addprefix $(BAREBOX_AM335X_DIR)/,$(BAREBOX_AM335X_IMAGES))
+BAREBOX_AM335X_IMAGES := $(addprefix $(BAREBOX_AM335X_BUILD_DIR)/,$(BAREBOX_AM335X_IMAGES))
ifdef PTXCONF_BAREBOX_AM335X
$(BAREBOX_AM335X_CONFIG):
@@ -61,10 +62,10 @@ endif
$(STATEDIR)/barebox-am335x.prepare: $(BAREBOX_AM335X_CONFIG)
@$(call targetinfo)
- @rm -f "$(BAREBOX_AM335X_DIR)/.ptxdist-defaultenv"
- @ln -s "$(call ptx/in-platformconfigdir, barebox-am335x-defaultenv)" \
- "$(BAREBOX_AM335X_DIR)/.ptxdist-defaultenv"
@$(call world/prepare, BAREBOX_AM335X)
+ @rm -f "$(BAREBOX_AM335X_BUILD_DIR)/.ptxdist-defaultenv"
+ @ln -s "$(call ptx/in-platformconfigdir, barebox-am335x-defaultenv)" \
+ "$(BAREBOX_AM335X_BUILD_DIR)/.ptxdist-defaultenv"
@$(call touch)
# ----------------------------------------------------------------------------
@@ -76,14 +77,14 @@ $(STATEDIR)/barebox-am335x.install:
@$(call touch)
# ----------------------------------------------------------------------------
-# Targetinstall
+# Target-Install
# ----------------------------------------------------------------------------
$(STATEDIR)/barebox-am335x.targetinstall:
@$(call targetinfo)
@$(foreach image, $(BAREBOX_AM335X_IMAGES), \
install -m 644 \
- $(image) $(IMAGEDIR)/$(notdir $(image));)
+ $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
@$(call touch)
# ----------------------------------------------------------------------------
@@ -94,7 +95,7 @@ $(STATEDIR)/barebox-am335x.clean:
@$(call targetinfo)
@$(call clean_pkg, BAREBOX_AM335X)
@$(foreach image, $(BAREBOX_AM335X_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x;)
+ rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x$(ptx/nl))
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 09/14] barebox-common: sync with latest barebox template
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
` (7 preceding siblings ...)
2019-10-29 11:28 ` [DistroKit] [PATCH 08/14] barebox-am335x: " Michael Olbrich
@ 2019-10-29 11:28 ` Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 10/14] barebox-vexpress: remove installed files Michael Olbrich
` (5 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:28 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
.../platform-v7a/rules/barebox-common.make | 53 ++++++++++---------
1 file changed, 28 insertions(+), 25 deletions(-)
diff --git a/configs/platform-v7a/rules/barebox-common.make b/configs/platform-v7a/rules/barebox-common.make
index 84df4fe63d03..8f7c52fd4c1d 100644
--- a/configs/platform-v7a/rules/barebox-common.make
+++ b/configs/platform-v7a/rules/barebox-common.make
@@ -9,22 +9,23 @@
#
# We provide this package
#
-EXTRA_PACKAGES-$(PTXCONF_BAREBOX_COMMON) += barebox-common
+PACKAGES-$(PTXCONF_BAREBOX_COMMON) += barebox-common
#
# Paths and names
#
-BAREBOX_COMMON_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
-BAREBOX_COMMON_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
-BAREBOX_COMMON := barebox-common-$(BAREBOX_COMMON_VERSION)
-BAREBOX_COMMON_SUFFIX := tar.bz2
-BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON)
-BAREBOX_COMMON_SOURCE := $(SRCDIR)/barebox-$(BAREBOX_COMMON_VERSION).$(BAREBOX_COMMON_SUFFIX)
-BAREBOX_COMMON_DIR := $(BUILDDIR)/$(BAREBOX_COMMON)
-BAREBOX_COMMON_LICENSE := GPL-2.0-only
-BAREBOX_COMMON_DEVPKG := NO
-
-BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_COMMON_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
+BAREBOX_COMMON_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
+BAREBOX_COMMON := barebox-common-$(BAREBOX_COMMON_VERSION)
+BAREBOX_COMMON_SUFFIX := tar.bz2
+BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON)
+BAREBOX_COMMON_PATCHES := barebox-$(BAREBOX_COMMON_VERSION)
+BAREBOX_COMMON_SOURCE := $(SRCDIR)/$(BAREBOX_COMMON_PATCHES).$(BAREBOX_COMMON_SUFFIX)
+BAREBOX_COMMON_DIR := $(BUILDDIR)/$(BAREBOX_COMMON)
+BAREBOX_COMMON_BUILD_DIR := $(BAREBOX_COMMON_DIR)-build
+BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_COMMON_LICENSE := GPL-2.0-only
+BAREBOX_COMMON_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
@@ -33,15 +34,25 @@ BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
# use host pkg-config for host tools
BAREBOX_COMMON_PATH := PATH=$(HOST_PATH)
-BAREBOX_COMMON_CONF_OPT := $(call barebox-opts)
+BAREBOX_COMMON_CONF_OPT := \
+ -C $(BAREBOX_COMMON_DIR) \
+ O=$(BAREBOX_COMMON_BUILD_DIR) \
+ $(call barebox-opts, BAREBOX_COMMON)
+
BAREBOX_COMMON_MAKE_OPT := $(BAREBOX_COMMON_CONF_OPT)
BAREBOX_COMMON_TAGS_OPT := TAGS tags cscope
-$(STATEDIR)/barebox-common.prepare:
- @$(call targetinfo)
- @$(call world/prepare, BAREBOX_COMMON)
- @$(call touch)
+ifdef PTXCONF_BAREBOX_COMMON
+$(BAREBOX_COMMON_CONFIG):
+ @echo
+ @echo "****************************************************************************"
+ @echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-common'"
+ @echo "****************************************************************************"
+ @echo
+ @echo
+ @exit 1
+endif
# ----------------------------------------------------------------------------
# Compile
@@ -59,14 +70,6 @@ $(STATEDIR)/barebox-common.install:
@$(call targetinfo)
@$(call touch)
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-common.targetinstall:
- @$(call targetinfo)
- @$(call touch)
-
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
# ----------------------------------------------------------------------------
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 10/14] barebox-vexpress: remove installed files
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
` (8 preceding siblings ...)
2019-10-29 11:28 ` [DistroKit] [PATCH 09/14] barebox-common: " Michael Olbrich
@ 2019-10-29 11:28 ` Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 11/14] barebox-rpi2: don't add a suffix to the images Michael Olbrich
` (4 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:28 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/rules/barebox-vexpress.make | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make
index 2007128e14da..625ff79b472d 100644
--- a/configs/platform-v7a/rules/barebox-vexpress.make
+++ b/configs/platform-v7a/rules/barebox-vexpress.make
@@ -97,6 +97,8 @@ $(STATEDIR)/barebox-vexpress.clean:
@$(call clean_pkg, BAREBOX_VEXPRESS)
@$(foreach image, $(BAREBOX_VEXPRESS_IMAGES), \
rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
+ @rm -vf $(IMAGEDIR)/barebox-zero-env-vexpress \
+ $(IMAGEDIR)/vexpress-v2p-ca9.dtb-bb
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 11/14] barebox-rpi2: don't add a suffix to the images
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
` (9 preceding siblings ...)
2019-10-29 11:28 ` [DistroKit] [PATCH 10/14] barebox-vexpress: remove installed files Michael Olbrich
@ 2019-10-29 11:28 ` Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 12/14] barebox-am335x-mlo: actually remove images during 'clean' Michael Olbrich
` (3 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:28 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
It's not needed and now the files are actually removed during 'clean'.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/config/images/rpi2.config | 2 +-
configs/platform-v7a/config/images/rpi3.config | 2 +-
configs/platform-v7a/rules/barebox-rpi2.make | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configs/platform-v7a/config/images/rpi2.config b/configs/platform-v7a/config/images/rpi2.config
index 428c00c2d7bd..3e45e1af5e54 100644
--- a/configs/platform-v7a/config/images/rpi2.config
+++ b/configs/platform-v7a/config/images/rpi2.config
@@ -1,7 +1,7 @@
image rpi2-boot.vfat {
vfat {
files = { @FIRMWARE_RPI2@ }
- file barebox.img { image = barebox-raspberry-pi-2.img-rpi2 }
+ file barebox.img { image = barebox-raspberry-pi-2.img }
}
size = 32M
}
diff --git a/configs/platform-v7a/config/images/rpi3.config b/configs/platform-v7a/config/images/rpi3.config
index 64911462723f..7bd1dae8dc46 100644
--- a/configs/platform-v7a/config/images/rpi3.config
+++ b/configs/platform-v7a/config/images/rpi3.config
@@ -1,7 +1,7 @@
image rpi3-boot.vfat {
vfat {
files = { @FIRMWARE_RPI3@ }
- file barebox.img { image = barebox-raspberry-pi-3.img-rpi2 }
+ file barebox.img { image = barebox-raspberry-pi-3.img }
}
size = 32M
}
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index 8f815f423db8..5f16584238d7 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -83,7 +83,7 @@ $(STATEDIR)/barebox-rpi2.targetinstall:
@$(call targetinfo)
@$(foreach image, $(BAREBOX_RPI2_IMAGES), \
install -m 644 \
- $(image) $(IMAGEDIR)/$(notdir $(image))-rpi2$(ptx/nl))
+ $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
@$(call touch)
# ----------------------------------------------------------------------------
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 12/14] barebox-am335x-mlo: actually remove images during 'clean'
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
` (10 preceding siblings ...)
2019-10-29 11:28 ` [DistroKit] [PATCH 11/14] barebox-rpi2: don't add a suffix to the images Michael Olbrich
@ 2019-10-29 11:28 ` Michael Olbrich
2019-10-29 11:29 ` [DistroKit] [PATCH 13/14] barebox-am335x: " Michael Olbrich
` (2 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:28 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/rules/barebox-am335x-mlo.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/platform-v7a/rules/barebox-am335x-mlo.make b/configs/platform-v7a/rules/barebox-am335x-mlo.make
index c668521a0d4c..534566ba9a1a 100644
--- a/configs/platform-v7a/rules/barebox-am335x-mlo.make
+++ b/configs/platform-v7a/rules/barebox-am335x-mlo.make
@@ -86,7 +86,7 @@ $(STATEDIR)/barebox-am335x-mlo.clean:
@$(call targetinfo)
@$(call clean_pkg, BAREBOX_AM335X_MLO)
@$(foreach image, $(BAREBOX_AM335X_MLO_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x-mlo$(ptx/nl))
+ rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 13/14] barebox-am335x: actually remove images during 'clean'
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
` (11 preceding siblings ...)
2019-10-29 11:28 ` [DistroKit] [PATCH 12/14] barebox-am335x-mlo: actually remove images during 'clean' Michael Olbrich
@ 2019-10-29 11:29 ` Michael Olbrich
2019-10-29 11:29 ` [DistroKit] [PATCH 14/14] barebox-mx6: " Michael Olbrich
2019-10-29 15:42 ` [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Robert Schwebel
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:29 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/rules/barebox-am335x.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make
index f738f34c66be..a10474afe017 100644
--- a/configs/platform-v7a/rules/barebox-am335x.make
+++ b/configs/platform-v7a/rules/barebox-am335x.make
@@ -95,7 +95,7 @@ $(STATEDIR)/barebox-am335x.clean:
@$(call targetinfo)
@$(call clean_pkg, BAREBOX_AM335X)
@$(foreach image, $(BAREBOX_AM335X_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x$(ptx/nl))
+ rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* [DistroKit] [PATCH 14/14] barebox-mx6: actually remove images during 'clean'
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
` (12 preceding siblings ...)
2019-10-29 11:29 ` [DistroKit] [PATCH 13/14] barebox-am335x: " Michael Olbrich
@ 2019-10-29 11:29 ` Michael Olbrich
2019-10-29 15:42 ` [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Robert Schwebel
14 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-10-29 11:29 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/rules/barebox-mx6.make | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make
index 2a1cb981d796..525ffd559c0e 100644
--- a/configs/platform-v7a/rules/barebox-mx6.make
+++ b/configs/platform-v7a/rules/barebox-mx6.make
@@ -101,7 +101,7 @@ $(STATEDIR)/barebox-mx6.clean:
@$(call targetinfo)
@$(call clean_pkg, BAREBOX_MX6)
@$(foreach image, $(BAREBOX_MX6_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))-mx6$(ptx/nl))
+ rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [DistroKit] [PATCH 00/14] Barebox Update and Cleanup
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
` (13 preceding siblings ...)
2019-10-29 11:29 ` [DistroKit] [PATCH 14/14] barebox-mx6: " Michael Olbrich
@ 2019-10-29 15:42 ` Robert Schwebel
2019-11-02 9:15 ` Robert Schwebel
14 siblings, 1 reply; 20+ messages in thread
From: Robert Schwebel @ 2019-10-29 15:42 UTC (permalink / raw)
To: Michael Olbrich; +Cc: distrokit
On Tue, Oct 29, 2019 at 12:28:47PM +0100, Michael Olbrich wrote:
> Here are some updates for the different barebox packages. It's a version
> bump to the latest release from Ahmad and various cleanups.
> Most of this is basically synchronization with the latest upstream
> template. This also includes a switch to out-of-tree builds, which is
> useful in combination with local-src.
> And there are some fixes for the package clean targets.
Looks good, testing in -next.
rsc
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [DistroKit] [PATCH 00/14] Barebox Update and Cleanup
2019-10-29 15:42 ` [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Robert Schwebel
@ 2019-11-02 9:15 ` Robert Schwebel
2019-11-04 10:09 ` Roland Hieber
0 siblings, 1 reply; 20+ messages in thread
From: Robert Schwebel @ 2019-11-02 9:15 UTC (permalink / raw)
To: Michael Olbrich; +Cc: distrokit
Hi,
On Tue, Oct 29, 2019 at 04:42:34PM +0100, Robert Schwebel wrote:
> On Tue, Oct 29, 2019 at 12:28:47PM +0100, Michael Olbrich wrote:
> > Here are some updates for the different barebox packages. It's a version
> > bump to the latest release from Ahmad and various cleanups.
> > Most of this is basically synchronization with the latest upstream
> > template. This also includes a switch to out-of-tree builds, which is
> > useful in combination with local-src.
> > And there are some fixes for the package clean targets.
>
> Looks good, testing in -next.
It failed on the beaglebone, could you please check?
http://jenkins.hi.pengutronix.de/job/ptxdist-bsps/job/DistroKit/job/labgrid-DistroKit-next-beaglebone/129/console
rsc
--
Pengutronix e.K. | Dipl.-Ing. Robert Schwebel |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [DistroKit] [PATCH 00/14] Barebox Update and Cleanup
2019-11-02 9:15 ` Robert Schwebel
@ 2019-11-04 10:09 ` Roland Hieber
2019-11-04 13:18 ` Rouven Czerwinski
0 siblings, 1 reply; 20+ messages in thread
From: Roland Hieber @ 2019-11-04 10:09 UTC (permalink / raw)
To: Robert Schwebel; +Cc: Michael Olbrich, distrokit
On Sat, Nov 02, 2019 at 10:15:31AM +0100, Robert Schwebel wrote:
> Hi,
>
> On Tue, Oct 29, 2019 at 04:42:34PM +0100, Robert Schwebel wrote:
> > On Tue, Oct 29, 2019 at 12:28:47PM +0100, Michael Olbrich wrote:
> > > Here are some updates for the different barebox packages. It's a version
> > > bump to the latest release from Ahmad and various cleanups.
> > > Most of this is basically synchronization with the latest upstream
> > > template. This also includes a switch to out-of-tree builds, which is
> > > useful in combination with local-src.
> > > And there are some fixes for the package clean targets.
> >
> > Looks good, testing in -next.
>
> It failed on the beaglebone, could you please check?
> http://jenkins.hi.pengutronix.de/job/ptxdist-bsps/job/DistroKit/job/labgrid-DistroKit-next-beaglebone/129/console
[...]
20:27:12 Aborted by Rouven Czerwinski
[...]
The next build now looks like the builds before that.
- Roland
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [DistroKit] [PATCH 00/14] Barebox Update and Cleanup
2019-11-04 10:09 ` Roland Hieber
@ 2019-11-04 13:18 ` Rouven Czerwinski
2019-11-04 21:16 ` Michael Olbrich
0 siblings, 1 reply; 20+ messages in thread
From: Rouven Czerwinski @ 2019-11-04 13:18 UTC (permalink / raw)
To: distrokit; +Cc: Michael Olbrich
Roland Hieber <rhi@pengutronix.de> writes:
> On Sat, Nov 02, 2019 at 10:15:31AM +0100, Robert Schwebel wrote:
>> Hi,
>>
>> On Tue, Oct 29, 2019 at 04:42:34PM +0100, Robert Schwebel wrote:
>> > On Tue, Oct 29, 2019 at 12:28:47PM +0100, Michael Olbrich wrote:
>> > > Here are some updates for the different barebox packages. It's a version
>> > > bump to the latest release from Ahmad and various cleanups.
>> > > Most of this is basically synchronization with the latest upstream
>> > > template. This also includes a switch to out-of-tree builds, which is
>> > > useful in combination with local-src.
>> > > And there are some fixes for the package clean targets.
>> >
>> > Looks good, testing in -next.
>>
>> It failed on the beaglebone, could you please check?
>> http://jenkins.hi.pengutronix.de/job/ptxdist-bsps/job/DistroKit/job/labgrid-DistroKit-next-beaglebone/129/console
>
> [...]
> 20:27:12 Aborted by Rouven Czerwinski
> [...]
>
> The next build now looks like the builds before that.
The patches lost the default boot target for the bootloader on
beaglebone, its trying to "boot net" instead of using the eMMC.
No need to continue a test run which won't work.
- rcz
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [DistroKit] [PATCH 00/14] Barebox Update and Cleanup
2019-11-04 13:18 ` Rouven Czerwinski
@ 2019-11-04 21:16 ` Michael Olbrich
0 siblings, 0 replies; 20+ messages in thread
From: Michael Olbrich @ 2019-11-04 21:16 UTC (permalink / raw)
To: distrokit
On Mon, Nov 04, 2019 at 02:18:45PM +0100, Rouven Czerwinski wrote:
> Roland Hieber <rhi@pengutronix.de> writes:
> > On Sat, Nov 02, 2019 at 10:15:31AM +0100, Robert Schwebel wrote:
> >> On Tue, Oct 29, 2019 at 04:42:34PM +0100, Robert Schwebel wrote:
> >> > On Tue, Oct 29, 2019 at 12:28:47PM +0100, Michael Olbrich wrote:
> >> > > Here are some updates for the different barebox packages. It's a version
> >> > > bump to the latest release from Ahmad and various cleanups.
> >> > > Most of this is basically synchronization with the latest upstream
> >> > > template. This also includes a switch to out-of-tree builds, which is
> >> > > useful in combination with local-src.
> >> > > And there are some fixes for the package clean targets.
> >> >
> >> > Looks good, testing in -next.
> >>
> >> It failed on the beaglebone, could you please check?
> >> http://jenkins.hi.pengutronix.de/job/ptxdist-bsps/job/DistroKit/job/labgrid-DistroKit-next-beaglebone/129/console
> >
> > [...]
> > 20:27:12 Aborted by Rouven Czerwinski
> > [...]
> >
> > The next build now looks like the builds before that.
>
> The patches lost the default boot target for the bootloader on
> beaglebone, its trying to "boot net" instead of using the eMMC.
>
> No need to continue a test run which won't work.
Right, that was my fault. I thought I tested this, but apparently not. And
building barebox does not fail when the extra environment is missing :-/.
I'll send new patches.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2019-11-04 21:16 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 01/14] v7a: barebox-common: modify oldconfig to affect all bareboxes Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 02/14] v7a: barebox-common: add clean target that affects " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 03/14] v7a: barebox: version bump 2019.08.1 → 2019.10.0 Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 04/14] barebox-vexpress: sync with latest barebox template Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 05/14] barebox-mx6: " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 06/14] barebox-rpi2: " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 07/14] barebox-am335x-mlo: " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 08/14] barebox-am335x: " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 09/14] barebox-common: " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 10/14] barebox-vexpress: remove installed files Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 11/14] barebox-rpi2: don't add a suffix to the images Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 12/14] barebox-am335x-mlo: actually remove images during 'clean' Michael Olbrich
2019-10-29 11:29 ` [DistroKit] [PATCH 13/14] barebox-am335x: " Michael Olbrich
2019-10-29 11:29 ` [DistroKit] [PATCH 14/14] barebox-mx6: " Michael Olbrich
2019-10-29 15:42 ` [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Robert Schwebel
2019-11-02 9:15 ` Robert Schwebel
2019-11-04 10:09 ` Roland Hieber
2019-11-04 13:18 ` Rouven Czerwinski
2019-11-04 21:16 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox