mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-29 16:10:58 +00:00
arm: novena: Switch novena to config_distro_bootcmd
Switch Novena to distro bootcmd, so it can be used with debian easily. Signed-off-by: Vagrant Cascadian <vagrant@aikidev.net> Signed-off-by: Marek Vasut <marex@denx.de> Cc: Sean Cross <xobs@kosagi.com> Cc: Stefano Babic <sbabic@denx.de> Tested-by: Vagrant Cascadian <vagrant@aikidev.net>
This commit is contained in:
parent
0c890879fe
commit
1c2d4a50e9
1 changed files with 22 additions and 1 deletions
|
@ -16,6 +16,7 @@
|
||||||
#define CONFIG_FIT
|
#define CONFIG_FIT
|
||||||
#define CONFIG_KEYBOARD
|
#define CONFIG_KEYBOARD
|
||||||
|
|
||||||
|
#include <config_distro_defaults.h>
|
||||||
#include "mx6_common.h"
|
#include "mx6_common.h"
|
||||||
|
|
||||||
/* U-Boot Commands */
|
/* U-Boot Commands */
|
||||||
|
@ -58,7 +59,7 @@
|
||||||
/* Booting Linux */
|
/* Booting Linux */
|
||||||
#define CONFIG_BOOTFILE "fitImage"
|
#define CONFIG_BOOTFILE "fitImage"
|
||||||
#define CONFIG_BOOTARGS "console=ttymxc1,115200 "
|
#define CONFIG_BOOTARGS "console=ttymxc1,115200 "
|
||||||
#define CONFIG_BOOTCOMMAND "run net_nfs"
|
#define CONFIG_BOOTCOMMAND "run distro_bootcmd ; run net_nfs"
|
||||||
#define CONFIG_HOSTNAME novena
|
#define CONFIG_HOSTNAME novena
|
||||||
|
|
||||||
/* Physical Memory Map */
|
/* Physical Memory Map */
|
||||||
|
@ -190,6 +191,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Extra U-Boot environment. */
|
/* Extra U-Boot environment. */
|
||||||
|
#ifndef CONFIG_SPL_BUILD
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
"fdt_high=0xffffffff\0" \
|
"fdt_high=0xffffffff\0" \
|
||||||
"initrd_high=0xffffffff\0" \
|
"initrd_high=0xffffffff\0" \
|
||||||
|
@ -199,6 +201,11 @@
|
||||||
"rootdev=/dev/mmcblk0p2\0" \
|
"rootdev=/dev/mmcblk0p2\0" \
|
||||||
"netdev=eth0\0" \
|
"netdev=eth0\0" \
|
||||||
"kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0" \
|
"kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0" \
|
||||||
|
"pxefile_addr_r="__stringify(CONFIG_LOADADDR)"\0" \
|
||||||
|
"scriptaddr="__stringify(CONFIG_LOADADDR)"\0" \
|
||||||
|
"ramdisk_addr_r=0x28000000\0" \
|
||||||
|
"fdt_addr_r=0x18000000\0" \
|
||||||
|
"fdtfile=imx6q-novena.dtb\0" \
|
||||||
"addcons=" \
|
"addcons=" \
|
||||||
"setenv bootargs ${bootargs} " \
|
"setenv bootargs ${bootargs} " \
|
||||||
"console=${consdev},${baudrate}\0" \
|
"console=${consdev},${baudrate}\0" \
|
||||||
|
@ -242,5 +249,19 @@
|
||||||
"fatwrite mmc 0:1 ${loadaddr} u-boot.img ${filesize} ; "\
|
"fatwrite mmc 0:1 ${loadaddr} u-boot.img ${filesize} ; "\
|
||||||
"fi ; " \
|
"fi ; " \
|
||||||
"fi\0" \
|
"fi\0" \
|
||||||
|
BOOTENV
|
||||||
|
|
||||||
|
#define BOOT_TARGET_DEVICES(func) \
|
||||||
|
func(MMC, mmc, 0) \
|
||||||
|
func(USB, usb, 0) \
|
||||||
|
func(SATA, sata, 0) \
|
||||||
|
func(PXE, pxe, na) \
|
||||||
|
func(DHCP, dhcp, na)
|
||||||
|
|
||||||
|
#include <config_distro_bootcmd.h>
|
||||||
|
|
||||||
|
#else
|
||||||
|
#define CONFIG_EXTRA_ENV_SETTINGS
|
||||||
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
|
Loading…
Reference in a new issue