- insert partition for dtb blob to TQM5200B MTD layout - fix MTD layout for highboot configuration - set env variables dependent on the configured board (TQM5200 or TQM5200B)
Signed-off-by: Martin Krause martin.krause@tqs.de --- If I receive no negative feedback, I'm going to pick this patch into the u-boot-tq-group.git custodian tree and do a pull-request, once the merge window has opened again.
Best Regards, Martin Krause
include/configs/TQM5200.h | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 5b2ed0f..4228888 100755 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -255,12 +255,22 @@ "setup=tftp 200000 cam5200/setup.img; autoscr 200000\0" #endif
+#if defined(CONFIG_TQM5200_B) +#define ENV_FLASH_LAYOUT \ + "fdt_addr=FC100000\0" \ + "kernel_addr=FC140000\0" \ + "ramdisk_addr=FC2C0000\0" +#else /* !CONFIG_TQM5200_B */ +#define ENV_FLASH_LAYOUT \ + "fdt_addr=FC0A0000\0" \ + "kernel_addr=FC0C0000\0" \ + "ramdisk_addr=FC240000\0" +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "console=ttyPSC0\0" \ - "fdt_addr=FC0A0000\0" \ - "kernel_addr=FC0C0000\0" \ - "ramdisk_addr=FC240000\0" \ + ENV_FLASH_LAYOUT \ "kernel_addr_r=400000\0" \ "fdt_addr_r=600000\0" \ "rootpath=/opt/eldk/ppc_6xx\0" \ @@ -403,13 +413,16 @@ # if defined(CONFIG_TQM5200_B) # if defined(CFG_LOWBOOT) # define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:1m(firmware)," \ + "256k(dtb)," \ "1536k(kernel)," \ - "3584k(small-fs)," \ + "3328k(small-fs)," \ "2m(initrd)," \ "8m(misc)," \ "16m(big-fs)" # else /* highboot */ -# define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:2560k(kernel)," \ +# define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:256k(dtb);" \ + "768k(environment)," \ + "1536k(kernel)," \ "3584k(small-fs)," \ "2m(initrd)," \ "8m(misc)," \