On Thu, 2014-10-02 at 09:53 -0700, Vagrant Cascadian wrote: > On 2014-09-28, Ian Campbell wrote: > > One caveat is that the Arndale platform requires a closed BSD licensed > > stage 1 > > blob. This can be downloaded from Linaro at > > http://releases.linaro.org/12.12/components/kernel/arndale-bl1/ or > > https://git.linaro.org/pkg/arndale-pre-boot.git > > > > Clearly this is not suitable for main (or even contrib) and I would > > completely > > understand if this were a blocker for including even the open source u-boot > > bits in main. > > That doesn't seem so different from the linux kernel modules that > require non-free firmware... while not thrilled about it, I don't see it > as a blocker for inclusion in debian's u-boot package. Or is it > substantially different?
No, I think it's about the same. > > > > FYI I have proposed a patch upstream to use the config_distro_defaults.h > > stuff > > see: http://lists.denx.de/pipermail/u-boot/2014-September/189939.html > > > > I'm also working on a patch to support the config_distro_bootcmd.h stuff, > > which > > I hope to submit upstream in the next few days. > > > > If Arndale is enabled then we may wish to consider backporting one or both > > of > > those. > > Sure. I've finally posted the second patch and attached a packaging patch to add both distro_defaults nad distro_bootcmd to the package. I've not had any reply upstream, although with the impending release of v2014.10 I suppose I don't expect to hear much until the next merge window. > > > > diff --git a/debian/targets b/debian/targets > > index 1406927..54ed07b 100644 > > --- a/debian/targets > > +++ b/debian/targets > > @@ -80,6 +80,9 @@ armhf imx wandboard_solo u-boot.imx > > # Hector Oron <[email protected]> > > armhf imx nitrogen6q u-boot.imx > > > > +# Ian Campbell <[email protected]> > > +armhf - arndale u-boot-dtb.bin > > spl/arndale-spl.bin > > + > > avr32 - hammerhead u-boot.img > > > > mips - dbau1100 u-boot.img > > Installing it without a subarch seems to be my biggest concern here, as > the u-boot package on armhf is essentially a meta-package that depends > on all the other variants... Ah, I hadn't realised that everything had moved for armhf. Makes sense. I'm happy to move to a subarch and retest. > or I could downgrade to recommends, though > that wouldn't ensure an upgrade path from wheezy. > > It might be worth moving it into a subarch package, though that could > get it held up in NEW... it looks to be an "exynos" based platform? > There are a couple other likely exynos candidates in mainline u-boot if > someone shows up willing to test them. Yes it's exynos based (specifically 5250 I think). There's a new arndale octa around now but I've not got one myself. Exynos5250 is also used in the original ARM chromebook FWIW. Not sure what newer ones use. I don't know about other exynos platforms but there are surely some around... Ian.
From c9aee7bc95b412b706f20125c52b6facbb9cc36e Mon Sep 17 00:00:00 2001 From: Ian Campbell <[email protected]> Date: Thu, 2 Oct 2014 08:08:15 +0100 Subject: [PATCH] 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 <[email protected]> +X-Patchwork-Id: 394344 +Message-Id: <[email protected]> +To: <[email protected]>, Minkyu Kang <[email protected]> +Cc: Ian Campbell <[email protected]> +Date: Mon, 29 Sep 2014 11:24:32 +0100 + +From: Ian Campbell <[email protected]> + +Signed-off-by: Ian Campbell <[email protected]> +--- + 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 <[email protected]> +X-Patchwork-Id: 393793 +Message-Id: <[email protected]> +To: <[email protected]>, Minkyu Kang <[email protected]>, + Inderpal Singh <[email protected]> +Cc: Ian Campbell <[email protected]> +Date: Fri, 26 Sep 2014 15:25:37 +0100 + +From: Ian Campbell <[email protected]> + +...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 <[email protected]> +--- + 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
