--- a/include/configs/brain_mx28_common.h +++ b/include/configs/brain_mx28_common.h @@ -52,6 +52,15 @@ #define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) + +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; run bootcmd_legacy" + +#include + /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ "stdin=serial\0" \ @@ -60,9 +69,15 @@ "bootdelay=0\0" \ "videomode=video=ctfb:x:" CONFIG_LCD_X ",y:" CONFIG_LCD_Y ",depth:16,pclk:30857,le:0,ri:0,up:0,lo:0,hs:0,vs:0,sync:0,vmode:0\0" \ "image=zImage\0" \ + "kernel_addr_r=0x42000000\0" \ + "fdt_addr_r=0x41000000\0" \ + "ramdisk_addr_r=0x43000000\0" \ + "scriptaddr=0x40800000\0" \ + "pxefile_addr_r=0x40800000\0" \ "console_mainline=ttyAMA0\0" \ "bootargs_custom=fbcon=font:ProFont6x11\0" \ "bootorder=emmc sd\0" \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_addr=0x41000000\0" \ "verbose=no\0" \ @@ -147,13 +162,14 @@ "run loadandimportenv; " \ "fi; " \ "done\0" \ - "bootcmd=" \ + "bootcmd_legacy=" \ "for choice in $bootorder; do " \ "if run select$choice; then " \ "run mmcboot; " \ "fi; " \ "done; " \ - "echo Failed to boot (X_X)" + "echo Failed to boot (X_X)\0" \ + BOOTENV /* The rest of the configuration is shared */ #include