From 911d3d62398f1a94b9a1b891eb509035736232ad Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Date: Mon, 16 Feb 2015 16:02:30 +0100 Subject: [PATCH 1/5] arm: gplugd: convert to generic board Enable CONFIG_SYS_GENERIC_BOARD for Marvell gplugD. Signed-off-by: Ajay Bhargav Acked-by: Prafulla Wadaskar Acked-by: Luka Perkov --- include/configs/gplugd.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 404c56af10..0ac198df8d 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -25,6 +25,11 @@ #define MACH_TYPE_SHEEVAD 2625 #endif +/* + * Generic board support + */ +#define CONFIG_SYS_GENERIC_BOARD + /* * Version number information */ From e3c6c7bfee388ceeb98991e9b08c83f097f3b02c Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Date: Mon, 16 Feb 2015 16:04:48 +0100 Subject: [PATCH 2/5] arm: aspenite: convert to generic board Enable CONFIG_SYS_GENERIC_BOARD for Marvell Aspenite. Signed-off-by: Ajay Bhargav Acked-by: Prafulla Wadaskar Acked-by: Luka Perkov --- include/configs/aspenite.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h index 727b14a6c2..47760ef7ba 100644 --- a/include/configs/aspenite.h +++ b/include/configs/aspenite.h @@ -10,6 +10,11 @@ #ifndef __CONFIG_ASPENITE_H #define __CONFIG_ASPENITE_H +/* + * Generic board support + */ +#define CONFIG_SYS_GENERIC_BOARD + /* * Version number information */ From c250ce0f570d89ef579827f8a2d98d1cbc4f1c2a Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Mon, 23 Feb 2015 11:25:20 +1300 Subject: [PATCH 3/5] kwbimage: align v1 binary header to 4B According to the Armada-XP documentation the binary header format requires the header length to be aligned to 4B. Signed-off-by: Chris Packham Acked-by: Stefan Roese Acked-by: Prafulla Wadaskar --- tools/kwbimage.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/kwbimage.c b/tools/kwbimage.c index de5c80847e..9540e7eb84 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -498,6 +498,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params, binhdrsz = sizeof(struct opt_hdr_v1) + (binarye->binary.nargs + 1) * sizeof(unsigned int) + s.st_size; + binhdrsz = ALIGN_SUP(binhdrsz, 32); hdr->headersz_lsb = binhdrsz & 0xFFFF; hdr->headersz_msb = (binhdrsz & 0xFFFF0000) >> 16; From ce4eae0e5a8ae620ba84ac5270dd8f2ade83c81f Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 24 Feb 2015 08:38:56 +0000 Subject: [PATCH 4/5] dreamplug: switch to GENERIC_BOARD Built and booted to a Linux prompt with no issues discovered. network and usb access to the external mmc are ok. (my internal mmc is knackered at the h/w level). Signed-off-by: Ian Campbell Acked-By: Prafulla Wadaskar --- include/configs/dreamplug.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 981233a070..37ae686eb7 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -37,6 +37,7 @@ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SYS_GENERIC_BOARD /* * Commands configuration From dbfc4c93f4d8cb495a4fd83b7edbbc3db1e04816 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 24 Feb 2015 08:38:57 +0000 Subject: [PATCH 5/5] dreamplug: set CONFIG_BUILD_TARGET to build u-boot.kwb Saves having to remember to ask make for it explicitly. Signed-off-by: Ian Campbell Acked-By: Prafulla Wadaskar --- include/configs/dreamplug.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 37ae686eb7..ea6e5c0329 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -39,6 +39,9 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #define CONFIG_SYS_GENERIC_BOARD +/* Add target to build it automatically upon "make" */ +#define CONFIG_BUILD_TARGET "u-boot.kwb" + /* * Commands configuration */