configs: fix build of many defconfigs

This defconfig tries to fetch its kernel source code and U-Boot source code from gitorious.org, which is not longer available. Therefore, this defconfig has been failing to build since quite some time. Since there's no obvious other place to grab the kernel and u-boot source code, and the defconfig was not updated since a long time, let's simply get rid of it.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 configs/gnublin_defconfig | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 configs/gnublin_defconfig

configs/gnublin_defconfig deleted +0 -28

deleted file mode 100644
index 369c9da..0000000
@@ -1,28 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_arm926t=y
-
-# System
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.7"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_7=y
-BR2_TARGET_GENERIC_ISSUE="Welcome to Gnublin"
-
-# Filesystem
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_BLOCKS=475000
-
-# Bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="GNUBLIN"
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://gitorious.org/u-boot-gnublin-support/u-boot-gnublin-support.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="2009.11_gnublin_support_v2"
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://gitorious.org/linux-3-7-gnublin/linux-3-7-gnublin.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v3.7-gnublin-2"
-BR2_LINUX_KERNEL_DEFCONFIG="gnublin"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y

Hello Thomas,

Quoted 6 lines · Thomas Petazzoni

This defconfig tries to fetch its kernel source code and U-Boot source code from gitorious.org, which is not longer available. Therefore, this defconfig has been failing to build since quite some time. Since there's no obvious other place to grab the kernel and u-boot source code, and the defconfig was not updated since a long time, let's simply get rid of it.

Just for the record, there are still (old?) sources for kernel/u-boot:

https://github.com/embeddedprojects/gnublin-lpc3131-2.6.33
https://github.com/embeddedprojects/gnublin-lpc3131-3.3.0
https://github.com/embeddedprojects/gnublin-distribution/tree/master/lpc3131/bootloader/u-boot

but nothing with a 3.7 or newer version...

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

This defconfig tries to fetch its kernel source code and U-Boot source code from gitorious.org, which is not longer available. Therefore, this defconfig has been failing to build since quite some time. Since there's no obvious other place to grab the kernel and u-boot source code, and the defconfig was not updated since a long time, let's simply get rid of it.

Signed-off-by Thomas Petazzoni <[email protected]>

From: Peter Seiderer <[email protected]>

Having a host variant of dtc is needed for example for U-Boot, which uses the Device Tree for a number of platforms.

In addition, now that we have a proper host-dtc package, it is no longer needed for the linux package to install the host dtc compiler:
users interested in having the host dtc compiler can simply enable this package.

A Config.in.host option is added to build host-dtc, because the initial reason why the host DTC built by the kernel was installed in $(HOST_DIR)/usr/bin (commit 707d44d0a28906ebda49584dd5f55985406f0bde from Thomas DS) was:

Having dtc as a host tool can be useful for users that have a custom boot scenario where the device tree is not embedded in the kernel.

[Thomas:
- remove the linux installation of host dtc.
- rework the commit log.]

Signed-off-by Peter Seiderer <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 linux/linux.mk             | 10 ----------
 package/Config.in.host     |  1 +
 package/dtc/Config.in.host |  9 +++++++++
 package/dtc/dtc.mk         | 10 ++++++++++
 4 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 package/dtc/Config.in.host

linux/linux.mk +0 -10

index bbcc54b..8c0db9b 100644
@@ -290,15 +290,6 @@ define LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET
 endef
 endif
 
-
-define LINUX_INSTALL_HOST_TOOLS
-	# Installing dtc (device tree compiler) as host tool, if selected
-	if grep -q "CONFIG_DTC=y" $(@D)/.config; then 	\
-		$(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/usr/bin/dtc ;	\
-	fi
-endef
-
-
 define LINUX_INSTALL_IMAGES_CMDS
 	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
 	$(LINUX_INSTALL_DTB)

@@ -313,7 +304,6 @@ define LINUX_INSTALL_TARGET_CMDS
 		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ;		\
 		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ;	\
 	fi
-	$(LINUX_INSTALL_HOST_TOOLS)
 endef
 
 # Include all our extensions and tools definitions.

package/Config.in.host +1 -0

index 1e047aa..1f69687 100644
@@ -5,6 +5,7 @@ menu "Host utilities"
 	source "package/dfu-util/Config.in.host"
 	source "package/dos2unix/Config.in.host"
 	source "package/dosfstools/Config.in.host"
+	source "package/dtc/Config.in.host"
 	source "package/e2fsprogs/Config.in.host"
 	source "package/e2tools/Config.in.host"
 	source "package/faketime/Config.in.host"

package/dtc/Config.in.host new file +9 -0

new file mode 100644
index 0000000..cbabf0a
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_HOST_DTC
+	bool "host dtc"
+	help
+	  The Device Tree Compiler, dtc, takes as input a device-tree in
+	  a given format and outputs a device-tree in another format.
+
+	  Install host tools: dtc, convert-dtsv0, fdtdump, fdtget and fdtput.
+
+	  https://git.kernel.org/cgit/utils/dtc/dtc.git

package/dtc/dtc.mk +10 -0

index e094f7b..f3b6f3b 100644
@@ -44,4 +44,14 @@ define DTC_INSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr $(DTC_INSTALL_GOAL)
 endef
 
+# host build
+define HOST_DTC_BUILD_CMDS
+	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr
+endef
+
+define HOST_DTC_INSTALL_CMDS
+	$(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install-bin
+endef
+
 $(eval $(generic-package))
+$(eval $(host-generic-package))

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Quoted 9 lines

From: Peter Seiderer <[email protected]>

Having a host variant of dtc is needed for example for U-Boot, which uses the Device Tree for a number of platforms.

In addition, now that we have a proper host-dtc package, it is no longer needed for the linux package to install the host dtc compiler:
users interested in having the host dtc compiler can simply enable this package.

No, please do not drop the linux dtc host...things have changed since my initial patch set. My intend was do enable a host dtc version with overlay support as used with the raspberry pi (therefore the host dtc package with overlay support patches which where not included with the rpi kernel sources dtc package). Now things have changed and the actual rpi kernel sources dtc already contain the overlay patches. Please keep both options, linux sources host dtc and extra host dtc package...

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

From: Peter Seiderer <[email protected]>
Having a host variant of dtc is needed for example for U-Boot, which uses the Device Tree for a number of platforms.

In addition, now that we have a proper host-dtc package, it is no longer needed for the linux package to install the host dtc compiler:
users interested in having the host dtc compiler can simply enable this package.

A Config.in.host option is added to build host-dtc, because the initial reason why the host DTC built by the kernel was installed in $(HOST_DIR)/usr/bin (commit 707d44d0a28906ebda49584dd5f55985406f0bde from Thomas DS) was:

Having dtc as a host tool can be useful for users that have a custom boot scenario where the device tree is not embedded in the kernel.

[Thomas:
- remove the linux installation of host dtc.
- rework the commit log.]

Some U-Boot configurations require the Device Tree compiler to be available, so we need to depend on host-dtc (example configuration:
zynq_zed).

However, we don't want to build it unconditionally, since the vast majority of U-Boot configurations don't need it (and host-dtc itself has a bunch of dependencies).

So, we simply add a Config.in option that allows users to indicate whether their U-Boot needs DTC or not, and depend on host-dtc if this option is enabled.

Signed-off-by Thomas Petazzoni <[email protected]>

---
 boot/uboot/Config.in | 7 +++++++
 boot/uboot/uboot.mk  | 4 ++++
 2 files changed, 11 insertions(+)

boot/uboot/Config.in +0 -0

index be51642..8643dab 100644

boot/uboot/Config.in +1 -0

+
 choice
 	prompt "U-Boot binary format"
 	default BR2_TARGET_UBOOT_FORMAT_BIN

boot/uboot/uboot.mk +4 -0

index 8f321ac..af583d1 100644
@@ -77,6 +77,10 @@ UBOOT_MAKE_OPTS += \
 	CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" \
 	ARCH=$(UBOOT_ARCH)
 
+ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
+UBOOT_DEPENDENCIES += host-dtc
+endif
+
 # Helper function to fill the U-Boot config.h file.
 # Argument 1: option name
 # Argument 2: option value

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Some U-Boot configurations require the Device Tree compiler to be available, so we need to depend on host-dtc (example configuration:
zynq_zed).

However, we don't want to build it unconditionally, since the vast majority of U-Boot configurations don't need it (and host-dtc itself has a bunch of dependencies).

So, we simply add a Config.in option that allows users to indicate whether their U-Boot needs DTC or not, and depend on host-dtc if this option is enabled.

Signed-off-by Thomas Petazzoni <[email protected]>

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

olimex_a20_olinuxino_lime_defconfig and zedboard_defconfig use U-Boot 2015.07, and they need host-dtc to build properly.

Signed-off-by Thomas Petazzoni <[email protected]>

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Both the Barebox and AT91Bootstrap patches for the Calao USB A9G20 board are located in the same directory, board/calao/usb-a9g20-lpw/, with only a prefix making a difference between whether they apply to Barebox or AT91Bootstrap.

Unfortunately, since commit 0eba4759fab9d093afacac77a0ac31f1f0b3cceb ("packages: apply custom patches using *.patch instead of <pkg>-*.patch"), the logic to apply custom patches in Barebox and AT91Bootstrap has been changed from applying <package>-*.patch to applying *.patch (in order to be consistent with what we do for all packages in Buildroot).

However, this had the effect of trying to apply both the AT91Bootstrap and Barebox patches on both packages, which obviously cannot work.

This commit fixes that by moving patches around, and switching to use BR2_GLOBAL_PATCH_DIR.

Cc Gregory Hermant <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

The Barebox, AT91Bootstrap and Linux patches for the Calao QIL A9260 board are all located in the same directory, board/calao/qil-a9260/, with only a prefix to indicate to which component they apply.

Unfortunately, since commit 0eba4759fab9d093afacac77a0ac31f1f0b3cceb ("packages: apply custom patches using *.patch instead of <pkg>-*.patch"), the logic to apply custom patches in Barebox and AT91Bootstrap has been changed from applying <package>-*.patch to applying *.patch (in order to be consistent with what we do for all packages in Buildroot).

However, this had the effect of trying to apply both the AT91Bootstrap and Barebox patches on both packages, which obviously cannot work.

This commit fixes that by moving patches around, and switching to use BR2_GLOBAL_PATCH_DIR for all of Barebox, AT91Bootstrap and Linux patches.

In addition, the defconfig was not specifying explicitly which Barebox version to use, so right now it's trying to use Barebox 2015.09, on which the board-specific patch does not apply. So we've forced to use Barebox 2012.08, which was the lastest release available at the time the defconfig was initially contributed.

Cc Gregory Hermant <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

The at91rm9200df_defconfig configuration is really old: it builds a 2.6.38 kernel with the old days kernel patches and a 2010.06 U-Boot. It hasn't been updated since a long time, so let's get rid of it.

The at91sam9260dfc_defconfig, at91sam9261ek_defconfig and at91sam9263ek_defconfig refer to kernel defconfigs that no longer exists, so they fail to build.

Cc Alexandre Belloni <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 configs/at91rm9200df_defconfig   | 30 ------------------------------
 configs/at91sam9260dfc_defconfig | 19 -------------------
 configs/at91sam9261ek_defconfig  | 19 -------------------
 configs/at91sam9263ek_defconfig  | 19 -------------------
 4 files changed, 87 deletions(-)
 delete mode 100644 configs/at91rm9200df_defconfig
 delete mode 100644 configs/at91sam9260dfc_defconfig
 delete mode 100644 configs/at91sam9261ek_defconfig
 delete mode 100644 configs/at91sam9263ek_defconfig

configs/at91rm9200df_defconfig deleted +0 -30

deleted file mode 100644
index 5994f43..0000000
@@ -1,30 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_arm920t=y
-
-# Filesystem
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y
-BR2_TARGET_ROOTFS_JFFS2_PAGESIZE=0x420
-BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x2100
-BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
-BR2_TARGET_ROOTFS_JFFS2_LE=y
-
-# Lock down headers to avoid breaking with new defaults
-BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
-BR2_DEFAULT_KERNEL_HEADERS="2.6.38.8"
-
-# Bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="at91rm9200ek"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2010.06"
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
-BR2_LINUX_KERNEL_PATCH="http://maxim.org.za/AT91RM9200/2.6/2.6.38-at91.patch.gz"
-BR2_LINUX_KERNEL_USE_DEFCONFIG=y
-BR2_LINUX_KERNEL_DEFCONFIG="at91rm9200ek"

configs/at91sam9260dfc_defconfig deleted +0 -19

deleted file mode 100644
index 20389f3..0000000
@@ -1,19 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_arm926t=y
-
-# Host utilities
-#
-BR2_PACKAGE_HOST_SAM_BA=y
-
-# First stage bootloader
-BR2_TARGET_AT91BOOTSTRAP=y
-BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9260ek"
-
-# Second stage bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="at91sam9260ek_dataflash_cs0"
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_DEFCONFIG="at91sam9260_9g20"

configs/at91sam9261ek_defconfig deleted +0 -19

deleted file mode 100644
index 0824a00..0000000
@@ -1,19 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_arm926t=y
-
-# Host utilities
-#
-BR2_PACKAGE_HOST_SAM_BA=y
-
-# First stage bootloader
-BR2_TARGET_AT91BOOTSTRAP=y
-BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9261ek"
-
-# Second stage bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="at91sam9261ek_dataflash_cs0"
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_DEFCONFIG="at91sam9261_9g10"

configs/at91sam9263ek_defconfig deleted +0 -19

deleted file mode 100644
index 208e057..0000000
@@ -1,19 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_arm926t=y
-
-# Host utilities
-#
-BR2_PACKAGE_HOST_SAM_BA=y
-
-# First stage bootloader
-BR2_TARGET_AT91BOOTSTRAP=y
-BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9263ek"
-
-# Second stage bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="at91sam9263ek_dataflash_cs0"
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_DEFCONFIG="at91sam9263"

Signature · 1 line

2.6.0

Hi,

Quoted 9 lines · Thomas Petazzoni

Quoted 9 lines

The at91rm9200df_defconfig configuration is really old: it builds a 2.6.38 kernel with the old days kernel patches and a 2010.06 U-Boot. It hasn't been updated since a long time, so let's get rid of it.

The at91sam9260dfc_defconfig, at91sam9261ek_defconfig and at91sam9263ek_defconfig refer to kernel defconfigs that no longer exists, so they fail to build.

I don't actually see any reason why they couldn't be updated. I'm actually using buildroot to build for my at91rm9200ek.

I'll try to update them. However, if you prefer deleting them in the meantime, that is fine.

The at91rm9200df_defconfig configuration is really old: it builds a 2.6.38 kernel with the old days kernel patches and a 2010.06 U-Boot. It hasn't been updated since a long time, so let's get rid of it.

The at91sam9260dfc_defconfig, at91sam9261ek_defconfig and at91sam9263ek_defconfig refer to kernel defconfigs that no longer exists, so they fail to build.

Cc Alexandre Belloni <[email protected]>

Signed-off-by Thomas Petazzoni <[email protected]>

---
 configs/at91rm9200df_defconfig   | 30 ------------------------------
 configs/at91sam9260dfc_defconfig | 19 -------------------
 configs/at91sam9261ek_defconfig  | 19 -------------------
 configs/at91sam9263ek_defconfig  | 19 -------------------
 4 files changed, 87 deletions(-)
 delete mode 100644 configs/at91rm9200df_defconfig
 delete mode 100644 configs/at91sam9260dfc_defconfig
 delete mode 100644 configs/at91sam9261ek_defconfig
 delete mode 100644 configs/at91sam9263ek_defconfig