This patch moves towards reducing board.c to simply a set of init cores for the three initialisation phases (Flash, Flash/RAM, and RAM), a set of three init function arrays and a init function array processing functionmaster
Graeme Russ
13 years ago
parent
b156ff09aa
commit
d47ab0ecde
@ -0,0 +1,39 @@ |
||||
/*
|
||||
* (C) Copyright 2011 |
||||
* Graeme Russ, <graeme.russ@gmail.com> |
||||
* |
||||
* See file CREDITS for list of people who contributed to this |
||||
* project. |
||||
* |
||||
* This program is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU General Public License as |
||||
* published by the Free Software Foundation; either version 2 of |
||||
* the License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program; if not, write to the Free Software |
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
||||
* MA 02111-1307 USA |
||||
*/ |
||||
|
||||
#ifndef _INIT_HELPERS_H_ |
||||
#define _INIT_HELPERS_H_ |
||||
|
||||
int display_banner(void); |
||||
int display_dram_config(void); |
||||
int init_baudrate_f(void); |
||||
|
||||
int mem_malloc_init_r(void); |
||||
int init_bd_struct_r(void); |
||||
int flash_init_r(void); |
||||
int init_ip_address_r(void); |
||||
int status_led_set_r(void); |
||||
int set_bootfile_r(void); |
||||
int set_load_addr_r(void); |
||||
|
||||
#endif /* !_INIT_HELPERS_H_ */ |
||||
@ -0,0 +1,42 @@ |
||||
/*
|
||||
* (C) Copyright 2011 |
||||
* Graeme Russ, <graeme.russ@gmail.com> |
||||
* |
||||
* See file CREDITS for list of people who contributed to this |
||||
* project. |
||||
* |
||||
* This program is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU General Public License as |
||||
* published by the Free Software Foundation; either version 2 of |
||||
* the License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program; if not, write to the Free Software |
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
||||
* MA 02111-1307 USA |
||||
*/ |
||||
|
||||
#ifndef _INIT_WRAPPERS_H_ |
||||
#define _INIT_WRAPPERS_H_ |
||||
|
||||
int serial_initialize_r(void); |
||||
int env_relocate_r(void); |
||||
int pci_init_r(void); |
||||
int jumptable_init_r(void); |
||||
int pcmcia_init_r(void); |
||||
int kgdb_init_r(void); |
||||
int enable_interrupts_r(void); |
||||
int eth_initialize_r(void); |
||||
int reset_phy_r(void); |
||||
int ide_init_r(void); |
||||
int scsi_init_r(void); |
||||
int doc_init_r(void); |
||||
int bb_miiphy_init_r(void); |
||||
int post_run_r(void); |
||||
|
||||
#endif /* !_INIT_WRAPPERS_H_ */ |
||||
@ -0,0 +1,142 @@ |
||||
/*
|
||||
* (C) Copyright 2011 |
||||
* Graeme Russ, <graeme.russ@gmail.com> |
||||
* |
||||
* See file CREDITS for list of people who contributed to this |
||||
* project. |
||||
* |
||||
* This program is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU General Public License as |
||||
* published by the Free Software Foundation; either version 2 of |
||||
* the License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program; if not, write to the Free Software |
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
||||
* MA 02111-1307 USA |
||||
*/ |
||||
#include <common.h> |
||||
#include <command.h> |
||||
#include <stdio_dev.h> |
||||
#include <version.h> |
||||
#include <malloc.h> |
||||
#include <net.h> |
||||
#include <ide.h> |
||||
#include <serial.h> |
||||
#include <status_led.h> |
||||
#include <asm/u-boot-x86.h> |
||||
|
||||
#include <asm/init_helpers.h> |
||||
|
||||
DECLARE_GLOBAL_DATA_PTR; |
||||
|
||||
/************************************************************************
|
||||
* Init Utilities * |
||||
************************************************************************ |
||||
* Some of this code should be moved into the core functions, |
||||
* or dropped completely, |
||||
* but let's get it working (again) first... |
||||
*/ |
||||
|
||||
int display_banner(void) |
||||
{ |
||||
printf("\n\n%s\n\n", version_string); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int display_dram_config(void) |
||||
{ |
||||
int i; |
||||
|
||||
puts("DRAM Configuration:\n"); |
||||
|
||||
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { |
||||
printf("Bank #%d: %08lx ", i, gd->bd->bi_dram[i].start); |
||||
print_size(gd->bd->bi_dram[i].size, "\n"); |
||||
} |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int init_baudrate_f(void) |
||||
{ |
||||
gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE); |
||||
return 0; |
||||
} |
||||
|
||||
int mem_malloc_init_r(void) |
||||
{ |
||||
mem_malloc_init(((gd->relocaddr - CONFIG_SYS_MALLOC_LEN)+3)&~3, |
||||
CONFIG_SYS_MALLOC_LEN); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
bd_t bd_data; |
||||
|
||||
int init_bd_struct_r(void) |
||||
{ |
||||
gd->bd = &bd_data; |
||||
memset(gd->bd, 0, sizeof(bd_t)); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
#ifndef CONFIG_SYS_NO_FLASH |
||||
int flash_init_r(void) |
||||
{ |
||||
ulong size; |
||||
|
||||
puts("Flash: "); |
||||
|
||||
/* configure available FLASH banks */ |
||||
size = flash_init(); |
||||
|
||||
print_size(size, "\n"); |
||||
|
||||
return 0; |
||||
} |
||||
#endif |
||||
|
||||
int init_ip_address_r(void) |
||||
{ |
||||
/* IP Address */ |
||||
bd_data.bi_ip_addr = getenv_IPaddr("ipaddr"); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
#ifdef CONFIG_STATUS_LED |
||||
int status_led_set_r(void) |
||||
{ |
||||
status_led_set(STATUS_LED_BOOT, STATUS_LED_BLINKING); |
||||
|
||||
return 0; |
||||
} |
||||
#endif |
||||
|
||||
int set_bootfile_r(void) |
||||
{ |
||||
char *s; |
||||
|
||||
s = getenv("bootfile"); |
||||
|
||||
if (s != NULL) |
||||
copy_filename(BootFile, s, sizeof(BootFile)); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int set_load_addr_r(void) |
||||
{ |
||||
/* Initialize from environment */ |
||||
load_addr = getenv_ulong("loadaddr", 16, load_addr); |
||||
|
||||
return 0; |
||||
} |
||||
@ -0,0 +1,137 @@ |
||||
/*
|
||||
* (C) Copyright 2011 |
||||
* Graeme Russ, <graeme.russ@gmail.com> |
||||
* |
||||
* See file CREDITS for list of people who contributed to this |
||||
* project. |
||||
* |
||||
* This program is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU General Public License as |
||||
* published by the Free Software Foundation; either version 2 of |
||||
* the License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU General Public License |
||||
* along with this program; if not, write to the Free Software |
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
||||
* MA 02111-1307 USA |
||||
*/ |
||||
#include <common.h> |
||||
#include <serial.h> |
||||
#include <kgdb.h> |
||||
#include <scsi.h> |
||||
#include <post.h> |
||||
#include <miiphy.h> |
||||
|
||||
#include <asm/init_wrappers.h> |
||||
|
||||
int serial_initialize_r(void) |
||||
{ |
||||
serial_initialize(); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int env_relocate_r(void) |
||||
{ |
||||
/* initialize environment */ |
||||
env_relocate(); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
|
||||
int pci_init_r(void) |
||||
{ |
||||
/* Do pci configuration */ |
||||
pci_init(); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int jumptable_init_r(void) |
||||
{ |
||||
jumptable_init(); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int pcmcia_init_r(void) |
||||
{ |
||||
puts("PCMCIA:"); |
||||
pcmcia_init(); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int kgdb_init_r(void) |
||||
{ |
||||
puts("KGDB: "); |
||||
kgdb_init(); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int enable_interrupts_r(void) |
||||
{ |
||||
/* enable exceptions */ |
||||
enable_interrupts(); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int eth_initialize_r(void) |
||||
{ |
||||
puts("Net: "); |
||||
eth_initialize(gd->bd); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int reset_phy_r(void) |
||||
{ |
||||
#ifdef DEBUG |
||||
puts("Reset Ethernet PHY\n"); |
||||
#endif |
||||
reset_phy(); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int ide_init_r(void) |
||||
{ |
||||
puts("IDE: "); |
||||
ide_init(); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int scsi_init_r(void) |
||||
{ |
||||
puts("SCSI: "); |
||||
scsi_init(); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
#ifdef CONFIG_BITBANGMII |
||||
int bb_miiphy_init_r(void) |
||||
{ |
||||
bb_miiphy_init(); |
||||
|
||||
return 0; |
||||
} |
||||
#endif |
||||
|
||||
#ifdef CONFIG_POST |
||||
int post_run_r(void) |
||||
{ |
||||
post_run(NULL, POST_RAM | post_bootmode_get(0)); |
||||
|
||||
return 0; |
||||
} |
||||
#endif |
||||
Loading…
Reference in new issue