On Thu, 2014-10-02 at 09:53 -0700, Vagrant Cascadian wrote: > Installing it without a subarch seems to be my biggest concern here
I've created an exynos subpackage. I've attached all three patches again just for clarity, the third one is the new one. Ian.
From 219a781dce3e7d78e3ec0215850fc5e832195b78 Mon Sep 17 00:00:00 2001 From: Ian Campbell <i...@debian.org> Date: Sun, 28 Sep 2014 15:31:55 +0100 Subject: [PATCH 1/3] Add support for the Arndale board. As well as the additional target this required adding a build-depends on the device tree compiler as well as a patch to support "make spl/$(BOARD)-spl.bin" from the top-level directory which is required by the current debian/rules file. --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/patches/board-spl-rule.diff | 17 +++++++++++++++++ debian/patches/series | 1 + debian/targets | 3 +++ 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 debian/patches/board-spl-rule.diff diff --git a/debian/changelog b/debian/changelog index 2d14e23..52e5e0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +u-boot (2014.10~rc2+dfsg1-2~exp2) UNRELEASED; urgency=medium + + [ Ian Campbell ] + * Add support for the Arndale board. + + -- Ian Campbell <i...@debian.org> Sat, 27 Sep 2014 09:48:00 +0100 + u-boot (2014.10~rc2+dfsg1-2~exp1) experimental; urgency=medium * Split u-boot package into u-boot-imx, u-boot-omap and u-boot-sunxi diff --git a/debian/control b/debian/control index 82d3614..f0b18b2 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Maintainer: Vagrant Cascadian <vagr...@debian.org> Uploaders: Loïc Minier <l...@debian.org>, Clint Adams <cl...@debian.org> -Build-Depends: debhelper (>= 9), bc +Build-Depends: debhelper (>= 9), bc, device-tree-compiler Standards-Version: 3.9.5 Homepage: http://www.denx.de/wiki/U-Boot/ Vcs-Git: git://anonscm.debian.org/collab-maint/u-boot.git diff --git a/debian/patches/board-spl-rule.diff b/debian/patches/board-spl-rule.diff new file mode 100644 index 0000000..e2cf895 --- /dev/null +++ b/debian/patches/board-spl-rule.diff @@ -0,0 +1,17 @@ +Description: Enable generic spl/$(BOARD)-spl.bin rule +Author: Ian Campbell <i...@debian.org> + +Needed for spl/arndale-spl.bin + +--- a/Makefile ++++ b/Makefile +@@ -1142,6 +1142,9 @@ + spl/sunxi-spl.bin: spl/u-boot-spl + @: + ++spl/$(BOARD)-spl.bin: spl/u-boot-spl ++ @: ++ + tpl/u-boot-tpl.bin: tools prepare + $(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all + diff --git a/debian/patches/series b/debian/patches/series index fa6f558..ff5e2a6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,3 +22,4 @@ workaround-env-ftbfs sunxi/0001-sun7i-Add-support-for-Olimex-A20-OLinuXino-LIME.patch tools-generic-builds.patch +board-spl-rule.diff diff --git a/debian/targets b/debian/targets index f0c2472..8b6d825 100644 --- a/debian/targets +++ b/debian/targets @@ -78,6 +78,9 @@ armhf imx wandboard_solo u-boot.imx # Hector Oron <zu...@debian.org> armhf imx nitrogen6q u-boot.imx +# Ian Campbell <i...@hellion.org.uk> +armhf - arndale u-boot-dtb.bin spl/arndale-spl.bin + avr32 - hammerhead u-boot.img mips - dbau1100 u-boot.img -- 2.1.0
From c9aee7bc95b412b706f20125c52b6facbb9cc36e Mon Sep 17 00:00:00 2001 From: Ian Campbell <i...@debian.org> Date: Thu, 2 Oct 2014 08:08:15 +0100 Subject: [PATCH 2/3] arndale: Enable distro defaults and distro config. Patches have been submitted upstream --- ...-Boot-arndale-Use-config_distro_bootcmd.h.patch | 81 +++++++++++++++++++ ...t-arndale-Enable-config_distro_defaults.h.patch | 94 ++++++++++++++++++++++ debian/patches/series | 2 + 3 files changed, 177 insertions(+) create mode 100644 debian/patches/U-Boot-arndale-Use-config_distro_bootcmd.h.patch create mode 100644 debian/patches/U-Boot-for-next-arndale-Enable-config_distro_defaults.h.patch diff --git a/debian/patches/U-Boot-arndale-Use-config_distro_bootcmd.h.patch b/debian/patches/U-Boot-arndale-Use-config_distro_bootcmd.h.patch new file mode 100644 index 0000000..189e5e1 --- /dev/null +++ b/debian/patches/U-Boot-arndale-Use-config_distro_bootcmd.h.patch @@ -0,0 +1,81 @@ +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [U-Boot] arndale: Use config_distro_bootcmd.h +From: Ian Campbell <i...@hellion.org.uk> +X-Patchwork-Id: 394344 +Message-Id: <1411986272-30809-1-git-send-email-...@hellion.org.uk> +To: <u-b...@lists.denx.de>, Minkyu Kang <mk7.k...@samsung.com> +Cc: Ian Campbell <ian.campb...@citrix.com> +Date: Mon, 29 Sep 2014 11:24:32 +0100 + +From: Ian Campbell <ian.campb...@citrix.com> + +Signed-off-by: Ian Campbell <ian.campb...@citrix.com> +--- + include/configs/arndale.h | 38 +++++++++++++++++++++++++++++--------- + 1 file changed, 29 insertions(+), 9 deletions(-) + +diff --git a/include/configs/arndale.h b/include/configs/arndale.h +index db7623d..a6630fd 100644 +--- a/include/configs/arndale.h ++++ b/include/configs/arndale.h +@@ -66,13 +66,6 @@ + /* Console configuration */ + #define CONFIG_CONSOLE_MUX + #define CONFIG_SYS_CONSOLE_IS_IN_ENV +-#define EXYNOS_DEVICE_SETTINGS \ +- "stdin=serial\0" \ +- "stdout=serial\0" \ +- "stderr=serial\0" +- +-#define CONFIG_EXTRA_ENV_SETTINGS \ +- EXYNOS_DEVICE_SETTINGS + + /* SD/MMC configuration */ + #define CONFIG_GENERIC_MMC +@@ -123,8 +116,6 @@ + #define CONFIG_SPL_TEXT_BASE 0x02023400 + #define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024) + +-#define CONFIG_BOOTCOMMAND "mmc read 40007000 451 2000; bootm 40007000" +- + /* Miscellaneous configurable options */ + #define CONFIG_SYS_PROMPT "ARNDALE # " + #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ +@@ -212,6 +203,35 @@ + + #include <config_distro_defaults.h> + ++#define BOOT_TARGET_DEVICES(func) \ ++ func(MMC, mmc, 1) \ ++ func(MMC, mmc, 0) \ ++ func(PXE, pxe, na) \ ++ func(DHCP, dhcp, na) ++ ++#include <config_distro_bootcmd.h> ++ ++ ++/* 2GB RAM, bootm size of 256M, load scripts after that */ ++#define MEM_LAYOUT_ENV_SETTINGS \ ++ "bootm_size=0x10000000\0" \ ++ "kernel_addr_r=0x42000000\0" \ ++ "fdt_addr_r=0x43000000\0" \ ++ "ramdisk_addr_r=0x43300000\0" \ ++ "scriptaddr=0x50000000\0" \ ++ "pxefile_addr_r=0x51000000\0" ++ ++#define EXYNOS_DEVICE_SETTINGS \ ++ "stdin=serial\0" \ ++ "stdout=serial\0" \ ++ "stderr=serial\0" \ ++ "fdtfile=exynos5250-arndale.dtb\0" ++ ++#define CONFIG_EXTRA_ENV_SETTINGS \ ++ EXYNOS_DEVICE_SETTINGS \ ++ MEM_LAYOUT_ENV_SETTINGS \ ++ BOOTENV ++ + /* PMIC */ + #define CONFIG_PMIC + #define CONFIG_POWER_I2C diff --git a/debian/patches/U-Boot-for-next-arndale-Enable-config_distro_defaults.h.patch b/debian/patches/U-Boot-for-next-arndale-Enable-config_distro_defaults.h.patch new file mode 100644 index 0000000..dd3e5d3 --- /dev/null +++ b/debian/patches/U-Boot-for-next-arndale-Enable-config_distro_defaults.h.patch @@ -0,0 +1,94 @@ +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [U-Boot,for-next] arndale: Enable config_distro_defaults.h +From: Ian Campbell <i...@hellion.org.uk> +X-Patchwork-Id: 393793 +Message-Id: <1411741537-29691-1-git-send-email-...@hellion.org.uk> +To: <u-b...@lists.denx.de>, Minkyu Kang <mk7.k...@samsung.com>, + Inderpal Singh <inderpal.si...@linaro.org> +Cc: Ian Campbell <ian.campb...@citrix.com> +Date: Fri, 26 Sep 2014 15:25:37 +0100 + +From: Ian Campbell <ian.campb...@citrix.com> + +...and remove explicit setting of things which this implies. + +I'm mainly interested in CONFIG_CMD_BOOTZ and CONFIG_SUPPORT_RAW_INITRD + +Signed-off-by: Ian Campbell <ian.campb...@citrix.com> +--- + include/configs/arndale.h | 22 ++-------------------- + 1 file changed, 2 insertions(+), 20 deletions(-) + +diff --git a/include/configs/arndale.h b/include/configs/arndale.h +index 75f9933..197d0fc 100644 +--- a/include/configs/arndale.h ++++ b/include/configs/arndale.h +@@ -45,7 +45,6 @@ + #define CONFIG_SETUP_MEMORY_TAGS + #define CONFIG_CMDLINE_TAG + #define CONFIG_INITRD_TAG +-#define CONFIG_CMDLINE_EDITING + + /* Power Down Modes */ + #define S5P_CHECK_SLEEP 0x00000BAD +@@ -98,15 +97,9 @@ + /* Command definition*/ + #include <config_cmd_default.h> + +-#define CONFIG_CMD_PING +-#define CONFIG_CMD_ELF + #define CONFIG_CMD_MMC +-#define CONFIG_CMD_EXT2 +-#define CONFIG_CMD_FAT +-#define CONFIG_CMD_NET + #define CONFIG_CMD_HASH + +-#define CONFIG_BOOTDELAY 3 + #define CONFIG_ZERO_BOOTDELAY_CHECK + + /* USB */ +@@ -133,8 +126,6 @@ + #define CONFIG_BOOTCOMMAND "mmc read 40007000 451 2000; bootm 40007000" + + /* Miscellaneous configurable options */ +-#define CONFIG_SYS_LONGHELP /* undef to save memory */ +-#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ + #define CONFIG_SYS_PROMPT "ARNDALE # " + #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ + #define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ +@@ -201,8 +192,6 @@ + #define BL2_START_OFFSET (CONFIG_BL2_OFFSET/512) + #define BL2_SIZE_BLOC_COUNT (CONFIG_BL2_SIZE/512) + +-#define CONFIG_DOS_PARTITION +-#define CONFIG_EFI_PARTITION + #define CONFIG_CMD_PART + #define CONFIG_PARTITION_UUIDS + +@@ -221,6 +210,8 @@ + #define CONFIG_SYS_I2C_S3C24X0_SLAVE 0x0 + #define CONFIG_I2C_EDID + ++#include <config_distro_defaults.h> ++ + /* PMIC */ + #define CONFIG_PMIC + #define CONFIG_POWER_I2C +@@ -238,15 +229,6 @@ + #define CONFIG_ENV_SROM_BANK 1 + #endif /*CONFIG_CMD_NET*/ + +-/* Enable PXE Support */ +-#ifdef CONFIG_CMD_NET +-#define CONFIG_CMD_PXE +-#define CONFIG_MENU +-#endif +- +-/* Enable devicetree support */ +-#define CONFIG_OF_LIBFDT +- + /* Enable Time Command */ + #define CONFIG_CMD_TIME + diff --git a/debian/patches/series b/debian/patches/series index ff5e2a6..afe2864 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -23,3 +23,5 @@ workaround-env-ftbfs sunxi/0001-sun7i-Add-support-for-Olimex-A20-OLinuXino-LIME.patch tools-generic-builds.patch board-spl-rule.diff +U-Boot-for-next-arndale-Enable-config_distro_defaults.h.patch +U-Boot-arndale-Use-config_distro_bootcmd.h.patch -- 2.1.0
From d44e22ee97f0f9641b589049d1793f7f081f72fc Mon Sep 17 00:00:00 2001
From: Ian Campbell <i...@debian.org>
Date: Fri, 3 Oct 2014 07:44:45 +0100
Subject: [PATCH 3/3] Move arndale to its own subarch pacakge.
---
debian/control | 17 ++++++++++++++++-
debian/targets | 2 +-
debian/u-boot-exynos.install | 2 ++
debian/u-boot-exynos.lintian-overrides | 11 +++++++++++
4 files changed, 30 insertions(+), 2 deletions(-)
create mode 100755 debian/u-boot-exynos.install
create mode 100644 debian/u-boot-exynos.lintian-overrides
diff --git a/debian/control b/debian/control
index f0b18b2..6052f48 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Package: u-boot
Architecture: armel armhf avr32 mips sh4
Multi-Arch: same
Depends: ${misc:Depends},
- u-boot-imx [armhf], u-boot-omap [armhf], u-boot-sunxi [armhf],
+ u-boot-imx [armhf], u-boot-omap [armhf], u-boot-sunxi [armhf], u-boot-exynos [armhf]
Description: A boot loader for embedded systems
Das U-Boot is a cross-platform bootloader for embedded systems,
used as the default boot loader by several board vendors. It is
@@ -68,6 +68,21 @@ Description: A boot loader for sunxi systems
This package includes boot loaders for various Allwinner/sunxi
platforms.
+Package: u-boot-exynos
+Architecture: armhf
+Multi-Arch: same
+Depends: ${misc:Depends}
+Breaks: u-boot (<< 2014.10~rc2+dfsg1-2~)
+Replaces: u-boot (<< 2014.10~rc2+dfsg1-2~)
+Description: A boot loader for exynos systems
+ Das U-Boot is a cross-platform bootloader for embedded systems,
+ used as the default boot loader by several board vendors. It is
+ intended to be easy to port and to debug, and runs on many
+ supported architectures, including PPC, ARM, MIPS, x86, m68k,
+ NIOS, and Microblaze.
+ .
+ This package includes boot loaders for various Exynos platforms.
+
Package: u-boot-tools
Architecture: linux-any
Multi-Arch: foreign
diff --git a/debian/targets b/debian/targets
index 8b6d825..70bca8c 100644
--- a/debian/targets
+++ b/debian/targets
@@ -79,7 +79,7 @@ armhf imx wandboard_solo u-boot.imx
armhf imx nitrogen6q u-boot.imx
# Ian Campbell <i...@hellion.org.uk>
-armhf - arndale u-boot-dtb.bin spl/arndale-spl.bin
+armhf exynos arndale u-boot-dtb.bin spl/arndale-spl.bin
avr32 - hammerhead u-boot.img
diff --git a/debian/u-boot-exynos.install b/debian/u-boot-exynos.install
new file mode 100755
index 0000000..e4408cf
--- /dev/null
+++ b/debian/u-boot-exynos.install
@@ -0,0 +1,2 @@
+#!/bin/sh
+debian/bin/u-boot-install-targets exynos
diff --git a/debian/u-boot-exynos.lintian-overrides b/debian/u-boot-exynos.lintian-overrides
new file mode 100644
index 0000000..b10b971
--- /dev/null
+++ b/debian/u-boot-exynos.lintian-overrides
@@ -0,0 +1,11 @@
+
+# There are no file conflicts across architectures for u-boot, as each
+# target is only installed on a single architecture. In theory, some
+# targets could be built on multiple architectures, but could instead install
+# the package for the architecture needed.
+u-boot-arndale [armhf]: arch-dependent-file-not-in-arch-specific-directory usr/lib/u-boot/arndale/uboot.elf
+
+# These bootloaders need to be statically linked.
+u-boot-arndale [armhf]: statically-linked-binary usr/lib/u-boot/arndale/uboot.elf
+
+u-boot-arndale: description-synopsis-starts-with-article
--
2.1.0
signature.asc
Description: This is a digitally signed message part
