mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 02:48:37 +02:00
[adm5120] calling of prom_detect_board is needed only when we still don't know the board
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7736 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
389a87145d
commit
a5ce51c5c3
@ -206,7 +206,7 @@ static struct adm5120_board __initdata adm5120_boards[] = {
|
||||
.name = "Infineon EASY 83000",
|
||||
.mach_type = MACH_ADM5120_EASY83000,
|
||||
.has_usb = 0,
|
||||
.iface_num = 0,
|
||||
.iface_num = 6,
|
||||
.flash0_size = 4*1024*1024,
|
||||
},
|
||||
{
|
||||
@ -880,7 +880,8 @@ static void __init adm5120_detect_board(void)
|
||||
if (t == MACH_ADM5120_UNKNOWN)
|
||||
t = uboot_detect_board();
|
||||
} else {
|
||||
t = prom_detect_board();
|
||||
if (t == MACH_ADM5120_UNKNOWN)
|
||||
t = prom_detect_board();
|
||||
}
|
||||
|
||||
for (board = adm5120_boards; board->mach_type != MACH_ADM5120_UNKNOWN;
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
#include <asm/mach-adm5120/adm5120_info.h>
|
||||
|
||||
static char **prom_envp;
|
||||
static char **prom_envp = NULL;
|
||||
|
||||
void setup_prom_printf(int);
|
||||
void prom_printf(char *, ...);
|
||||
@ -106,7 +106,9 @@ void __init prom_init(void)
|
||||
{
|
||||
char *cmd;
|
||||
|
||||
prom_envp = (char **)fw_arg2;
|
||||
if ((fw_arg2 & 3) == 0) {
|
||||
prom_envp = (char **)fw_arg2;
|
||||
}
|
||||
|
||||
adm5120_info_init();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user