Commit 136846d7 authored by Valentin Longchamp's avatar Valentin Longchamp Committed by Prafulla Wadaskar
Browse files

arm/km: remove duplicate code



This patch removes 2 small portions of board specific code that are
duplicated with common ARM code and thus unnecessary. These 2 portions
of code concern the mach id that is given by u-boot to the Linux kernel
to identify the system's MACH.

The first one was the possibility to change the MACH thanks to the
'mach_id' enviroment variable. This is possible thanks to the 'machid'
env variable (see arch/arm/lib/bootm.c:boot_jump_linux()).

The seconde one is the setting of the bi_arch_number. This is already
done in arch/arm/lib/board.c:board_init_f() since km_arm.h does #define
CONFIG_MACH_TYPE.
Signed-off-by: default avatarValentin Longchamp <valentin.longchamp@keymile.com>
cc: Holger Brunck <holger.brunck@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
Acked-by: default avatarPrafulla Wadaskar <Prafulla@marvell.com>
parent 37bead1a
...@@ -193,15 +193,6 @@ void set_bootcount_addr(void) ...@@ -193,15 +193,6 @@ void set_bootcount_addr(void)
int misc_init_r(void) int misc_init_r(void)
{ {
char *str;
int mach_type;
str = getenv("mach_type");
if (str != NULL) {
mach_type = simple_strtoul(str, NULL, 10);
printf("Overwriting MACH_TYPE with %d!!!\n", mach_type);
gd->bd->bi_arch_number = mach_type;
}
#if defined(CONFIG_KM_MGCOGE3UN) #if defined(CONFIG_KM_MGCOGE3UN)
char *wait_for_ne; char *wait_for_ne;
wait_for_ne = getenv("waitforne"); wait_for_ne = getenv("waitforne");
...@@ -258,11 +249,6 @@ int board_early_init_f(void) ...@@ -258,11 +249,6 @@ int board_early_init_f(void)
int board_init(void) int board_init(void)
{ {
/*
* arch number of board
*/
gd->bd->bi_arch_number = MACH_TYPE_KM_KIRKWOOD;
/* address of boot parameters */ /* address of boot parameters */
gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100; gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment