* [Buildroot] [PATCH 1/7] configs: remove gnublin_defconfig
2015-10-03 19:44 [Buildroot] [PATCH 0/7] configs: fix build of many defconfigs Thomas Petazzoni
@ 2015-10-03 19:44 ` Thomas Petazzoni
2015-10-03 21:06 ` Peter Seiderer
2015-10-04 17:01 ` Peter Korsgaard
2015-10-03 19:44 ` [Buildroot] [PATCH 2/7] dtc: add host build Thomas Petazzoni
` (5 subsequent siblings)
6 siblings, 2 replies; 22+ messages in thread
From: Thomas Petazzoni @ 2015-10-03 19:44 UTC (permalink / raw)
To: buildroot
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 <thomas.petazzoni@free-electrons.com>
---
configs/gnublin_defconfig | 28 ----------------------------
1 file changed, 28 deletions(-)
delete mode 100644 configs/gnublin_defconfig
diff --git a/configs/gnublin_defconfig b/configs/gnublin_defconfig
deleted file mode 100644
index 369c9da..0000000
--- a/configs/gnublin_defconfig
+++ /dev/null
@@ -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
--
2.6.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 1/7] configs: remove gnublin_defconfig
2015-10-03 19:44 ` [Buildroot] [PATCH 1/7] configs: remove gnublin_defconfig Thomas Petazzoni
@ 2015-10-03 21:06 ` Peter Seiderer
2015-10-04 8:15 ` Thomas Petazzoni
2015-10-04 17:01 ` Peter Korsgaard
1 sibling, 1 reply; 22+ messages in thread
From: Peter Seiderer @ 2015-10-03 21:06 UTC (permalink / raw)
To: buildroot
Hello Thomas,
On Sat, 3 Oct 2015 20:44:11 +0100, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
> 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...
Regards,
Peter
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> configs/gnublin_defconfig | 28 ----------------------------
> 1 file changed, 28 deletions(-)
> delete mode 100644 configs/gnublin_defconfig
>
> diff --git a/configs/gnublin_defconfig b/configs/gnublin_defconfig
> deleted file mode 100644
> index 369c9da..0000000
> --- a/configs/gnublin_defconfig
> +++ /dev/null
> @@ -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
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 1/7] configs: remove gnublin_defconfig
2015-10-03 21:06 ` Peter Seiderer
@ 2015-10-04 8:15 ` Thomas Petazzoni
0 siblings, 0 replies; 22+ messages in thread
From: Thomas Petazzoni @ 2015-10-04 8:15 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 3 Oct 2015 23:06:04 +0200, Peter Seiderer wrote:
> Hello Thomas,
>
> On Sat, 3 Oct 2015 20:44:11 +0100, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
>
> > 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...
Yes, I also saw those sources, but since they were older than the 3.7
kernel used in the defconfig and couldn't find any other recent
version, I decided to drop the defconfig entirely.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 1/7] configs: remove gnublin_defconfig
2015-10-03 19:44 ` [Buildroot] [PATCH 1/7] configs: remove gnublin_defconfig Thomas Petazzoni
2015-10-03 21:06 ` Peter Seiderer
@ 2015-10-04 17:01 ` Peter Korsgaard
1 sibling, 0 replies; 22+ messages in thread
From: Peter Korsgaard @ 2015-10-04 17:01 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 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 <thomas.petazzoni@free-electrons.com>
You forgot to remove board/gnublin/README.
Committed with that fixed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 2/7] dtc: add host build
2015-10-03 19:44 [Buildroot] [PATCH 0/7] configs: fix build of many defconfigs Thomas Petazzoni
2015-10-03 19:44 ` [Buildroot] [PATCH 1/7] configs: remove gnublin_defconfig Thomas Petazzoni
@ 2015-10-03 19:44 ` Thomas Petazzoni
2015-10-03 21:13 ` Peter Seiderer
2015-10-04 18:14 ` Peter Korsgaard
2015-10-03 19:44 ` [Buildroot] [PATCH 3/7] u-boot: add an option to indicate that DTC is needed Thomas Petazzoni
` (4 subsequent siblings)
6 siblings, 2 replies; 22+ messages in thread
From: Thomas Petazzoni @ 2015-10-03 19:44 UTC (permalink / raw)
To: buildroot
From: Peter Seiderer <ps.report@gmx.net>
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 <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
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
diff --git a/linux/linux.mk b/linux/linux.mk
index bbcc54b..8c0db9b 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -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.
diff --git a/package/Config.in.host b/package/Config.in.host
index 1e047aa..1f69687 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -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"
diff --git a/package/dtc/Config.in.host b/package/dtc/Config.in.host
new file mode 100644
index 0000000..cbabf0a
--- /dev/null
+++ b/package/dtc/Config.in.host
@@ -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
diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
index e094f7b..f3b6f3b 100644
--- a/package/dtc/dtc.mk
+++ b/package/dtc/dtc.mk
@@ -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))
--
2.6.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 2/7] dtc: add host build
2015-10-03 19:44 ` [Buildroot] [PATCH 2/7] dtc: add host build Thomas Petazzoni
@ 2015-10-03 21:13 ` Peter Seiderer
2015-10-04 18:12 ` Peter Korsgaard
2015-10-04 18:14 ` Peter Korsgaard
1 sibling, 1 reply; 22+ messages in thread
From: Peter Seiderer @ 2015-10-03 21:13 UTC (permalink / raw)
To: buildroot
Hello Thomas,
On Sat, 3 Oct 2015 20:44:12 +0100, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
> From: Peter Seiderer <ps.report@gmx.net>
>
> 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...
Regards,
Peter
>
> 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 <ps.report@gmx.net>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> 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
>
> diff --git a/linux/linux.mk b/linux/linux.mk
> index bbcc54b..8c0db9b 100644
> --- a/linux/linux.mk
> +++ b/linux/linux.mk
> @@ -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.
> diff --git a/package/Config.in.host b/package/Config.in.host
> index 1e047aa..1f69687 100644
> --- a/package/Config.in.host
> +++ b/package/Config.in.host
> @@ -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"
> diff --git a/package/dtc/Config.in.host b/package/dtc/Config.in.host
> new file mode 100644
> index 0000000..cbabf0a
> --- /dev/null
> +++ b/package/dtc/Config.in.host
> @@ -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
> diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
> index e094f7b..f3b6f3b 100644
> --- a/package/dtc/dtc.mk
> +++ b/package/dtc/dtc.mk
> @@ -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))
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 2/7] dtc: add host build
2015-10-03 21:13 ` Peter Seiderer
@ 2015-10-04 18:12 ` Peter Korsgaard
0 siblings, 0 replies; 22+ messages in thread
From: Peter Korsgaard @ 2015-10-04 18:12 UTC (permalink / raw)
To: buildroot
>>>>> "Peter" == Peter Seiderer <ps.report@gmx.net> writes:
Hi,
>> From: Peter Seiderer <ps.report@gmx.net>
>>
>> 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...
The problem really is that dtc isn't dtc. I've changed the Linux kernel
package to install its dtc into $(HOST_DIR)/usr/bin/linux-dtc instead so
it doesn't conflict with host-dtc.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 2/7] dtc: add host build
2015-10-03 19:44 ` [Buildroot] [PATCH 2/7] dtc: add host build Thomas Petazzoni
2015-10-03 21:13 ` Peter Seiderer
@ 2015-10-04 18:14 ` Peter Korsgaard
1 sibling, 0 replies; 22+ messages in thread
From: Peter Korsgaard @ 2015-10-04 18:14 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> From: Peter Seiderer <ps.report@gmx.net>
> 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.]
Committed with the linux.mk part dropped, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 3/7] u-boot: add an option to indicate that DTC is needed
2015-10-03 19:44 [Buildroot] [PATCH 0/7] configs: fix build of many defconfigs Thomas Petazzoni
2015-10-03 19:44 ` [Buildroot] [PATCH 1/7] configs: remove gnublin_defconfig Thomas Petazzoni
2015-10-03 19:44 ` [Buildroot] [PATCH 2/7] dtc: add host build Thomas Petazzoni
@ 2015-10-03 19:44 ` Thomas Petazzoni
2015-10-03 21:19 ` Arnout Vandecappelle
2015-10-04 18:15 ` Peter Korsgaard
2015-10-03 19:44 ` [Buildroot] [PATCH 4/7] configs: fix configurations that need host-dtc Thomas Petazzoni
` (3 subsequent siblings)
6 siblings, 2 replies; 22+ messages in thread
From: Thomas Petazzoni @ 2015-10-03 19:44 UTC (permalink / raw)
To: buildroot
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 <thomas.petazzoni@free-electrons.com>
---
boot/uboot/Config.in | 7 +++++++
boot/uboot/uboot.mk | 4 ++++
2 files changed, 11 insertions(+)
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index be51642..8643dab 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -139,6 +139,13 @@ config BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE
Path to the U-Boot configuration file.
endif
+config BR2_TARGET_UBOOT_NEEDS_DTC
+ bool "U-Boot needs dtc"
+ select BR2_PACKAGE_HOST_DTC
+ help
+ Select this option if your U-Boot board configuration
+ requires the Device Tree compiler to be available.
+
choice
prompt "U-Boot binary format"
default BR2_TARGET_UBOOT_FORMAT_BIN
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 8f321ac..af583d1 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -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
--
2.6.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 3/7] u-boot: add an option to indicate that DTC is needed
2015-10-03 19:44 ` [Buildroot] [PATCH 3/7] u-boot: add an option to indicate that DTC is needed Thomas Petazzoni
@ 2015-10-03 21:19 ` Arnout Vandecappelle
2015-10-04 18:15 ` Peter Korsgaard
1 sibling, 0 replies; 22+ messages in thread
From: Arnout Vandecappelle @ 2015-10-03 21:19 UTC (permalink / raw)
To: buildroot
On 03-10-15 20:44, Thomas Petazzoni wrote:
> 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 <thomas.petazzoni@free-electrons.com>
I don't really like that the option has to be user-configurable, but I see no
other way. So:
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
with one small nit.
> ---
> boot/uboot/Config.in | 7 +++++++
> boot/uboot/uboot.mk | 4 ++++
> 2 files changed, 11 insertions(+)
>
> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
> index be51642..8643dab 100644
> --- a/boot/uboot/Config.in
> +++ b/boot/uboot/Config.in
> @@ -139,6 +139,13 @@ config BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE
> Path to the U-Boot configuration file.
> endif
>
> +config BR2_TARGET_UBOOT_NEEDS_DTC
> + bool "U-Boot needs dtc"
> + select BR2_PACKAGE_HOST_DTC
> + help
> + Select this option if your U-Boot board configuration
> + requires the Device Tree compiler to be available.
Device Tree Compiler.
> +
> choice
> prompt "U-Boot binary format"
> default BR2_TARGET_UBOOT_FORMAT_BIN
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index 8f321ac..af583d1 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -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
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 3/7] u-boot: add an option to indicate that DTC is needed
2015-10-03 19:44 ` [Buildroot] [PATCH 3/7] u-boot: add an option to indicate that DTC is needed Thomas Petazzoni
2015-10-03 21:19 ` Arnout Vandecappelle
@ 2015-10-04 18:15 ` Peter Korsgaard
1 sibling, 0 replies; 22+ messages in thread
From: Peter Korsgaard @ 2015-10-04 18:15 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 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 <thomas.petazzoni@free-electrons.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 4/7] configs: fix configurations that need host-dtc
2015-10-03 19:44 [Buildroot] [PATCH 0/7] configs: fix build of many defconfigs Thomas Petazzoni
` (2 preceding siblings ...)
2015-10-03 19:44 ` [Buildroot] [PATCH 3/7] u-boot: add an option to indicate that DTC is needed Thomas Petazzoni
@ 2015-10-03 19:44 ` Thomas Petazzoni
2015-10-04 18:16 ` Peter Korsgaard
2015-10-03 19:44 ` [Buildroot] [PATCH 5/7] configs: fix build of calao_usb_a9g20_lpw_defconfig Thomas Petazzoni
` (2 subsequent siblings)
6 siblings, 1 reply; 22+ messages in thread
From: Thomas Petazzoni @ 2015-10-03 19:44 UTC (permalink / raw)
To: buildroot
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 <thomas.petazzoni@free-electrons.com>
---
configs/olimex_a20_olinuxino_lime_defconfig | 1 +
configs/zedboard_defconfig | 1 +
2 files changed, 2 insertions(+)
diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig
index fa2e98e..53286b4 100644
--- a/configs/olimex_a20_olinuxino_lime_defconfig
+++ b/configs/olimex_a20_olinuxino_lime_defconfig
@@ -37,6 +37,7 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="A20-OLinuXino-Lime"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.07"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_FORMAT_BIN=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
diff --git a/configs/zedboard_defconfig b/configs/zedboard_defconfig
index 761e32f..92e7c59 100644
--- a/configs/zedboard_defconfig
+++ b/configs/zedboard_defconfig
@@ -21,6 +21,7 @@ BR2_TARGET_UBOOT_BOARDNAME="zynq_zed"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.07"
BR2_TARGET_UBOOT_PATCH="$(TOPDIR)/board/avnet/zedboard/uboot"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_ZYNQ_IMAGE=y
--
2.6.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 5/7] configs: fix build of calao_usb_a9g20_lpw_defconfig
2015-10-03 19:44 [Buildroot] [PATCH 0/7] configs: fix build of many defconfigs Thomas Petazzoni
` (3 preceding siblings ...)
2015-10-03 19:44 ` [Buildroot] [PATCH 4/7] configs: fix configurations that need host-dtc Thomas Petazzoni
@ 2015-10-03 19:44 ` Thomas Petazzoni
2015-10-04 17:06 ` Peter Korsgaard
2015-10-03 19:44 ` [Buildroot] [PATCH 6/7] configs: fix build of calao_qil_a9260_defconfig Thomas Petazzoni
2015-10-03 19:44 ` [Buildroot] [PATCH 7/7] configs: remove old/broken Atmel configurations Thomas Petazzoni
6 siblings, 1 reply; 22+ messages in thread
From: Thomas Petazzoni @ 2015-10-03 19:44 UTC (permalink / raw)
To: buildroot
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 <gregory.hermant@calao-systems.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../at91bootstrap/0001-usb-a9g20-lpw.patch} | 0
.../barebox/0001-usb-a9g20-lpw.patch} | 0
configs/calao_usb_a9g20_lpw_defconfig | 3 +--
3 files changed, 1 insertion(+), 2 deletions(-)
rename board/calao/usb-a9g20-lpw/{at91bootstrap-1.16-usb-a9g20-lpw.patch => patches/at91bootstrap/0001-usb-a9g20-lpw.patch} (100%)
rename board/calao/usb-a9g20-lpw/{barebox-2012.07.0-usb-a9g20-lpw.patch => patches/barebox/0001-usb-a9g20-lpw.patch} (100%)
diff --git a/board/calao/usb-a9g20-lpw/at91bootstrap-1.16-usb-a9g20-lpw.patch b/board/calao/usb-a9g20-lpw/patches/at91bootstrap/0001-usb-a9g20-lpw.patch
similarity index 100%
rename from board/calao/usb-a9g20-lpw/at91bootstrap-1.16-usb-a9g20-lpw.patch
rename to board/calao/usb-a9g20-lpw/patches/at91bootstrap/0001-usb-a9g20-lpw.patch
diff --git a/board/calao/usb-a9g20-lpw/barebox-2012.07.0-usb-a9g20-lpw.patch b/board/calao/usb-a9g20-lpw/patches/barebox/0001-usb-a9g20-lpw.patch
similarity index 100%
rename from board/calao/usb-a9g20-lpw/barebox-2012.07.0-usb-a9g20-lpw.patch
rename to board/calao/usb-a9g20-lpw/patches/barebox/0001-usb-a9g20-lpw.patch
diff --git a/configs/calao_usb_a9g20_lpw_defconfig b/configs/calao_usb_a9g20_lpw_defconfig
index cf114d9..e9d0665 100644
--- a/configs/calao_usb_a9g20_lpw_defconfig
+++ b/configs/calao_usb_a9g20_lpw_defconfig
@@ -1,13 +1,12 @@
BR2_arm=y
BR2_arm926t=y
+BR2_GLOBAL_PATCH_DIR="board/calao/usb-a9g20-lpw/patches/"
BR2_PACKAGE_HOST_SAM_BA=y
BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_AT91BOOTSTRAP=y
-BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR="board/calao/usb-a9g20-lpw/"
BR2_TARGET_AT91BOOTSTRAP_BOARD="usb_a9g20_lpw"
BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
BR2_TARGET_BAREBOX=y
-BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR="board/calao/usb-a9g20-lpw/"
BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="usb_a9g20"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
--
2.6.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 5/7] configs: fix build of calao_usb_a9g20_lpw_defconfig
2015-10-03 19:44 ` [Buildroot] [PATCH 5/7] configs: fix build of calao_usb_a9g20_lpw_defconfig Thomas Petazzoni
@ 2015-10-04 17:06 ` Peter Korsgaard
0 siblings, 0 replies; 22+ messages in thread
From: Peter Korsgaard @ 2015-10-04 17:06 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 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 <gregory.hermant@calao-systems.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 6/7] configs: fix build of calao_qil_a9260_defconfig
2015-10-03 19:44 [Buildroot] [PATCH 0/7] configs: fix build of many defconfigs Thomas Petazzoni
` (4 preceding siblings ...)
2015-10-03 19:44 ` [Buildroot] [PATCH 5/7] configs: fix build of calao_usb_a9g20_lpw_defconfig Thomas Petazzoni
@ 2015-10-03 19:44 ` Thomas Petazzoni
2015-10-04 17:06 ` Peter Korsgaard
2015-10-03 19:44 ` [Buildroot] [PATCH 7/7] configs: remove old/broken Atmel configurations Thomas Petazzoni
6 siblings, 1 reply; 22+ messages in thread
From: Thomas Petazzoni @ 2015-10-03 19:44 UTC (permalink / raw)
To: buildroot
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 <gregory.hermant@calao-systems.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
.../at91bootstrap/0001-qil-a9260.patch} | 0
.../barebox/0001-qil-a9260.patch} | 0
.../{linux-3.4.7.patch => patches/linux/0001-qil-a9260.patch} | 0
configs/calao_qil_a9260_defconfig | 6 +++---
4 files changed, 3 insertions(+), 3 deletions(-)
rename board/calao/qil-a9260/{at91bootstrap-1.16-qil-a9260.patch => patches/at91bootstrap/0001-qil-a9260.patch} (100%)
rename board/calao/qil-a9260/{barebox-2012.07.0-qil-a9260.patch => patches/barebox/0001-qil-a9260.patch} (100%)
rename board/calao/qil-a9260/{linux-3.4.7.patch => patches/linux/0001-qil-a9260.patch} (100%)
diff --git a/board/calao/qil-a9260/at91bootstrap-1.16-qil-a9260.patch b/board/calao/qil-a9260/patches/at91bootstrap/0001-qil-a9260.patch
similarity index 100%
rename from board/calao/qil-a9260/at91bootstrap-1.16-qil-a9260.patch
rename to board/calao/qil-a9260/patches/at91bootstrap/0001-qil-a9260.patch
diff --git a/board/calao/qil-a9260/barebox-2012.07.0-qil-a9260.patch b/board/calao/qil-a9260/patches/barebox/0001-qil-a9260.patch
similarity index 100%
rename from board/calao/qil-a9260/barebox-2012.07.0-qil-a9260.patch
rename to board/calao/qil-a9260/patches/barebox/0001-qil-a9260.patch
diff --git a/board/calao/qil-a9260/linux-3.4.7.patch b/board/calao/qil-a9260/patches/linux/0001-qil-a9260.patch
similarity index 100%
rename from board/calao/qil-a9260/linux-3.4.7.patch
rename to board/calao/qil-a9260/patches/linux/0001-qil-a9260.patch
diff --git a/configs/calao_qil_a9260_defconfig b/configs/calao_qil_a9260_defconfig
index 05af114..f18337f 100644
--- a/configs/calao_qil_a9260_defconfig
+++ b/configs/calao_qil_a9260_defconfig
@@ -1,5 +1,6 @@
BR2_arm=y
BR2_arm926t=y
+BR2_GLOBAL_PATCH_DIR="board/calao/qil-a9260/patches/"
BR2_TARGET_GENERIC_GETTY_PORT="ttyS1"
BR2_KERNEL_HEADERS_VERSION=y
BR2_DEFAULT_KERNEL_VERSION="3.4"
@@ -7,16 +8,15 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y
BR2_PACKAGE_HOST_SAM_BA=y
BR2_TARGET_ROOTFS_UBIFS=y
BR2_TARGET_AT91BOOTSTRAP=y
-BR2_TARGET_AT91BOOTSTRAP_CUSTOM_PATCH_DIR="board/calao/qil-a9260/"
BR2_TARGET_AT91BOOTSTRAP_BOARD="qil_a9260"
BR2_TARGET_AT91BOOTSTRAP_NANDFLASH=y
BR2_TARGET_BAREBOX=y
-BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR="board/calao/qil-a9260/"
+BR2_TARGET_BAREBOX_CUSTOM_VERSION=y
+BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2012.08.0"
BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="qil_a9260"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.4.7"
-BR2_LINUX_KERNEL_PATCH="board/calao/qil-a9260/linux-3.4.7.patch"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/calao/qil-a9260/linux-3.4.7.config"
BR2_LINUX_KERNEL_ZIMAGE=y
--
2.6.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 6/7] configs: fix build of calao_qil_a9260_defconfig
2015-10-03 19:44 ` [Buildroot] [PATCH 6/7] configs: fix build of calao_qil_a9260_defconfig Thomas Petazzoni
@ 2015-10-04 17:06 ` Peter Korsgaard
0 siblings, 0 replies; 22+ messages in thread
From: Peter Korsgaard @ 2015-10-04 17:06 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 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 <gregory.hermant@calao-systems.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 7/7] configs: remove old/broken Atmel configurations
2015-10-03 19:44 [Buildroot] [PATCH 0/7] configs: fix build of many defconfigs Thomas Petazzoni
` (5 preceding siblings ...)
2015-10-03 19:44 ` [Buildroot] [PATCH 6/7] configs: fix build of calao_qil_a9260_defconfig Thomas Petazzoni
@ 2015-10-03 19:44 ` Thomas Petazzoni
2015-10-03 20:41 ` Alexandre Belloni
2015-10-13 21:30 ` Thomas Petazzoni
6 siblings, 2 replies; 22+ messages in thread
From: Thomas Petazzoni @ 2015-10-03 19:44 UTC (permalink / raw)
To: buildroot
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 <alexandre.belloni@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
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
diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
deleted file mode 100644
index 5994f43..0000000
--- a/configs/at91rm9200df_defconfig
+++ /dev/null
@@ -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"
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
deleted file mode 100644
index 20389f3..0000000
--- a/configs/at91sam9260dfc_defconfig
+++ /dev/null
@@ -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"
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
deleted file mode 100644
index 0824a00..0000000
--- a/configs/at91sam9261ek_defconfig
+++ /dev/null
@@ -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"
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
deleted file mode 100644
index 208e057..0000000
--- a/configs/at91sam9263ek_defconfig
+++ /dev/null
@@ -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"
--
2.6.0
^ permalink raw reply related [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 7/7] configs: remove old/broken Atmel configurations
2015-10-03 19:44 ` [Buildroot] [PATCH 7/7] configs: remove old/broken Atmel configurations Thomas Petazzoni
@ 2015-10-03 20:41 ` Alexandre Belloni
2015-10-03 20:54 ` Arnout Vandecappelle
2015-10-13 21:30 ` Thomas Petazzoni
1 sibling, 1 reply; 22+ messages in thread
From: Alexandre Belloni @ 2015-10-03 20:41 UTC (permalink / raw)
To: buildroot
Hi,
On 03/10/2015 at 20:44:17 +0100, Thomas Petazzoni wrote :
> 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.
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> 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
>
> diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
> deleted file mode 100644
> index 5994f43..0000000
> --- a/configs/at91rm9200df_defconfig
> +++ /dev/null
> @@ -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"
> diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
> deleted file mode 100644
> index 20389f3..0000000
> --- a/configs/at91sam9260dfc_defconfig
> +++ /dev/null
> @@ -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"
> diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
> deleted file mode 100644
> index 0824a00..0000000
> --- a/configs/at91sam9261ek_defconfig
> +++ /dev/null
> @@ -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"
> diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
> deleted file mode 100644
> index 208e057..0000000
> --- a/configs/at91sam9263ek_defconfig
> +++ /dev/null
> @@ -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"
> --
> 2.6.0
>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 7/7] configs: remove old/broken Atmel configurations
2015-10-03 20:41 ` Alexandre Belloni
@ 2015-10-03 20:54 ` Arnout Vandecappelle
0 siblings, 0 replies; 22+ messages in thread
From: Arnout Vandecappelle @ 2015-10-03 20:54 UTC (permalink / raw)
To: buildroot
On 03-10-15 21:41, Alexandre Belloni wrote:
> Hi,
>
> On 03/10/2015 at 20:44:17 +0100, Thomas Petazzoni wrote :
>> > 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.
>
There's no hurry to remove them.
BTW, when updating these defconfigs, please make sure that the kernel headers
version and the kernel version are fixated.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 7/7] configs: remove old/broken Atmel configurations
2015-10-03 19:44 ` [Buildroot] [PATCH 7/7] configs: remove old/broken Atmel configurations Thomas Petazzoni
2015-10-03 20:41 ` Alexandre Belloni
@ 2015-10-13 21:30 ` Thomas Petazzoni
1 sibling, 0 replies; 22+ messages in thread
From: Thomas Petazzoni @ 2015-10-13 21:30 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 3 Oct 2015 20:44:17 +0100, Thomas Petazzoni wrote:
> 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 <alexandre.belloni@free-electrons.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> 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
I've applied this patch. Alex, when you have some time, don't hesitate
to resubmit new defconfig for those boards.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 22+ messages in thread