diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-12 14:51:16 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-12 14:51:16 +0100 |
| commit | 06e42c6e2ce269667daecd6229d0b7c813838203 (patch) | |
| tree | ba752563a5b865f1c3015f17ef5437f5f2dcc90f | |
| parent | 5738946be46c513fd945d3e1d8f8a0fa718b7c58 (diff) | |
| parent | c4df21490179ae95ef13b92ce7980992ffb1e5f8 (diff) | |
| download | talos-obmc-uboot-06e42c6e2ce269667daecd6229d0b7c813838203.tar.gz talos-obmc-uboot-06e42c6e2ce269667daecd6229d0b7c813838203.zip | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
pm9g45: init serial console before relocation
pm9261: init serial console before relocation
pm9263: init serial console before relocation
| -rw-r--r-- | board/ronetix/pm9261/pm9261.c | 17 | ||||
| -rw-r--r-- | board/ronetix/pm9263/pm9263.c | 22 | ||||
| -rw-r--r-- | board/ronetix/pm9g45/pm9g45.c | 16 | ||||
| -rw-r--r-- | include/configs/pm9261.h | 1 | ||||
| -rw-r--r-- | include/configs/pm9263.h | 1 | ||||
| -rw-r--r-- | include/configs/pm9g45.h | 1 |
6 files changed, 40 insertions, 18 deletions
diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c index c6b582d2b9..79a3216d31 100644 --- a/board/ronetix/pm9261/pm9261.c +++ b/board/ronetix/pm9261/pm9261.c @@ -237,21 +237,28 @@ void lcd_show_board_info(void) #endif /* CONFIG_LCD */ -int board_init(void) +int board_early_init_f(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; - /* Enable Ctrlc */ - console_init_f(); - + /* Enable clocks for some PIOs */ writel(1 << ATMEL_ID_PIOA | 1 << ATMEL_ID_PIOC, &pmc->pcer); + at91_seriald_hw_init(); + + return 0; +} + +int board_init(void) +{ + /* arch number of PM9261-Board */ + gd->bd->bi_arch_number = MACH_TYPE_PM9261; + /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - at91_seriald_hw_init(); #ifdef CONFIG_CMD_NAND pm9261_nand_hw_init(); #endif diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c index 59cca87a9b..1266114aee 100644 --- a/board/ronetix/pm9263/pm9263.c +++ b/board/ronetix/pm9263/pm9263.c @@ -336,22 +336,28 @@ void lcd_show_board_info(void) #endif /* CONFIG_LCD */ -int board_init(void) +int board_early_init_f(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; - /* Enable Ctrlc */ - console_init_f(); - - writel((1 << ATMEL_ID_PIOA) | - (1 << ATMEL_ID_PIOCDE) | - (1 << ATMEL_ID_PIOB), + /* Enable clocks for all PIOs */ + writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) | + (1 << ATMEL_ID_PIOCDE), &pmc->pcer); + at91_seriald_hw_init(); + + return 0; +} + +int board_init(void) +{ + /* arch number of AT91SAM9263EK-Board */ + gd->bd->bi_arch_number = MACH_TYPE_PM9263; + /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - at91_seriald_hw_init(); #ifdef CONFIG_CMD_NAND pm9263_nand_hw_init(); #endif diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c index d29d0763ac..b5a11f2303 100644 --- a/board/ronetix/pm9g45/pm9g45.c +++ b/board/ronetix/pm9g45/pm9g45.c @@ -127,22 +127,28 @@ static void pm9g45_macb_hw_init(void) } #endif -int board_init(void) +int board_early_init_f(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; - /* Enable Ctrlc */ - console_init_f(); - + /* Enable clocks for all PIOs */ writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) | (1 << ATMEL_ID_PIOC) | (1 << ATMEL_ID_PIODE), &pmc->pcer); + at91_seriald_hw_init(); + + return 0; +} + +int board_init(void) +{ + /* arch number of AT91SAM9M10G45EK-Board */ + gd->bd->bi_arch_number = MACH_TYPE_PM9G45; /* adress of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - at91_seriald_hw_init(); #ifdef CONFIG_CMD_NAND pm9g45_nand_hw_init(); #endif diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 9fbf9afe2f..1e803169e6 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -161,6 +161,7 @@ #define CONFIG_INITRD_TAG 1 #undef CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_BOARD_EARLY_INIT_F /* * Hardware drivers diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 374be27396..32c596241a 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -172,6 +172,7 @@ #undef CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_USER_LOWLEVEL_INIT 1 +#define CONFIG_BOARD_EARLY_INIT_F /* * Hardware drivers diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 5b08d91097..eec9153300 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -57,6 +57,7 @@ #define CONFIG_INITRD_TAG 1 #define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_BOARD_EARLY_INIT_F /* * Hardware drivers |
