[U-Boot] [PATCH v3] odroid-c2: Enable distro boot

[U-Boot] [PATCH v3] odroid-c2: Enable distro boot

[Andreas Färber]

Use the generic "distro" boot framework to enable automatic DHCP boot.
MMC and USB are not yet implemented, so this is the only boot option.

The fdt and kernel addresses are adopted from downstream; ramdisk and
scriptaddr addresses were chosen arbitrarily.

Signed-off-by: Andreas F?rber <afaerber@suse.de>
---
 Kconfig                             |  1 +
 configs/odroid-c2_defconfig         |  1 -
 include/configs/meson-gxbb-common.h | 14 ++++++++++++++
 include/configs/odroid-c2.h         |  2 ++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Kconfig b/Kconfig
index 3f79f6f..166fbf8 100644
--- a/Kconfig
+++ b/Kconfig
@@ -57,6 +57,7 @@ config DISTRO_DEFAULTS
 	bool "Select defaults suitable for booting general purpose Linux distributions"
 	default y if ARCH_SUNXI || TEGRA
 	default y if ARCH_LS2080A
+	default y if ARCH_MESON
 	default y if ARCH_ROCKCHIP
 	default n
 	select CMD_BOOTZ if ARM && !ARM64
diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig
index 7d0b2b1..119ab07 100644
--- a/configs/odroid-c2_defconfig
+++ b/configs/odroid-c2_defconfig
@@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
-# CONFIG_CMD_SOURCE is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h
index 3bba2e6..75f6dc5 100644
--- a/include/configs/meson-gxbb-common.h
+++ b/include/configs/meson-gxbb-common.h
@@ -40,4 +40,18 @@
 
 #include <config_distro_defaults.h>
 
+#define BOOT_TARGET_DEVICES(func) \
+	func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"fdt_addr_r=0x01000000\0" \
+	"scriptaddr=0x1f000000\0" \
+	"kernel_addr_r=0x01080000\0" \
+	"pxefile_addr_r=0x01080000\0" \
+	"ramdisk_addr_r=0x10000000\0" \
+	MESON_FDTFILE_SETTING \
+	BOOTENV
+
 #endif /* __MESON_GXBB_COMMON_CONFIG_H */
diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h
index 1d5b3d5..bf7e1af 100644
--- a/include/configs/odroid-c2.h
+++ b/include/configs/odroid-c2.h
@@ -12,6 +12,8 @@
 #define CONFIG_CONS_INDEX		0
 #define CONFIG_BAUDRATE			115200
 
+#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0"
+
 #include <configs/meson-gxbb-common.h>
 
 #endif /* __CONFIG_H */
-- 
2.10.2

[U-Boot] [PATCH v3] odroid-c2: Enable distro boot

[Alexander Graf]

> Am 15.01.2017 um 20:22 schrieb Andreas F?rber <afaerber@suse.de>:
> 
> Use the generic "distro" boot framework to enable automatic DHCP boot.
> MMC and USB are not yet implemented, so this is the only boot option.
> 
> The fdt and kernel addresses are adopted from downstream; ramdisk and
> scriptaddr addresses were chosen arbitrarily.
> 
> Signed-off-by: Andreas F?rber <afaerber@suse.de>

Reviewed-by: Alexander Graf <agraf@suse.de>

Tom, if this doesn't get picked up in time for the merge window by the maintainer, please take it directly :).


Alex

[U-Boot] [U-Boot,v3] odroid-c2: Enable distro boot

[Vagrant Cascadian]

On 2017-01-15, Andreas F?rber wrote:
> Use the generic "distro" boot framework to enable automatic DHCP boot.

Thanks for this!


> diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h
> index 3bba2e6..75f6dc5 100644
> --- a/include/configs/meson-gxbb-common.h
> +++ b/include/configs/meson-gxbb-common.h
> @@ -40,4 +40,18 @@
>  
>  #include <config_distro_defaults.h>
>  
> +#define BOOT_TARGET_DEVICES(func) \
> +	func(DHCP, dhcp, na)

Any reason not to also support and prefer "PXE" here?

  func(PXE, pxe, na)

The syslinux-style config files support boot menus and are easier to
generate than boot images.


live well,
  vagrant
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170118/e408ebd7/attachment.sig>

[U-Boot] [U-Boot,v3] odroid-c2: Enable distro boot

[Tom Rini]

On Sun, Jan 15, 2017 at 08:22:30PM +0100, Andreas F?rber wrote:

> Use the generic "distro" boot framework to enable automatic DHCP boot.
> MMC and USB are not yet implemented, so this is the only boot option.
> 
> The fdt and kernel addresses are adopted from downstream; ramdisk and
> scriptaddr addresses were chosen arbitrarily.
> 
> Signed-off-by: Andreas F?rber <afaerber@suse.de>
> Reviewed-by: Alexander Graf <agraf@suse.de>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170120/ca5408aa/attachment.sig>