From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Cooper Date: Tue, 26 Jul 2011 21:19:26 +0000 Subject: [U-Boot] RFC [PATCH 5/5 v5] dreamplug: use MACH_TYPE_DREAMPLUG In-Reply-To: <05ec95501d6c02ffeb1bc38d09fdca99142956a3.1307979826.git.u-boot@lakedaemon.net> References: <05ec95501d6c02ffeb1bc38d09fdca99142956a3.1307979826.git.u-boot@lakedaemon.net> Message-ID: <1311715171-13128-5-git-send-email-u-boot@lakedaemon.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Signed-off-by: Jason Cooper --- board/Marvell/dreamplug/dreamplug.c | 7 ++----- include/configs/dreamplug.h | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c index cdc094a..f848db7 100644 --- a/board/Marvell/dreamplug/dreamplug.c +++ b/board/Marvell/dreamplug/dreamplug.c @@ -104,11 +104,8 @@ int board_early_init_f(void) int board_init(void) { - /* - * arch number of board - * XXX: change to MACH_TYPE_DREAMPLUG once in Linux mainline. - */ - gd->bd->bi_arch_number = MACH_TYPE_GURUPLUG; + /* arch number of board */ + gd->bd->bi_arch_number = MACH_TYPE_DREAMPLUG; /* adress of boot parameters */ gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100; diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 2a908f4..4be2e59 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -39,7 +39,7 @@ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ #define CONFIG_KIRKWOOD 1 /* SOC Family Name */ #define CONFIG_KW88F6281 1 /* SOC Name */ -#define CONFIG_MACH_GURUPLUG /* Machine type */ +#define CONFIG_MACH_DREAMPLUG /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* -- 1.7.0.4