Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make pm9g45 buildable for v2011.06 release

Browse Source 
Signed-off-by: Asen Chavdarov Dimov <dimov@ronetix.at>
Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>

changed at91_serial_hw_init to at91_seriald_hw_init
master
Asen Dimov 14 years ago committed by Albert ARIBAUD
parent 684a567ace
commit eb6e608b32
5 changed files with 27 additions and 27 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      MAKEALL
  2. 4
      Makefile
  3. 32
      board/ronetix/pm9g45/pm9g45.c
  4. 1
      boards.cfg
  5. 16
      include/configs/pm9g45.h

1
MAKEALL
Unescape View File

@ -445,7 +445,6 @@ LIST_ARMV7=" \
LIST_at91="$(boards_by_soc at91)\ LIST_at91="$(boards_by_soc at91)\
at91sam9m10g45ek \ at91sam9m10g45ek \
pm9g45 \
" "
######################################################################### #########################################################################

4
Makefile
Unescape View File

@ -823,10 +823,6 @@ at91sam9g45ekes_config : unconfig
fi; fi;
@$(MKCONFIG) -n $@ -a at91sam9m10g45ek arm arm926ejs at91sam9m10g45ek atmel at91 @$(MKCONFIG) -n $@ -a at91sam9m10g45ek arm arm926ejs at91sam9m10g45ek atmel at91
pm9g45_config : unconfig
@mkdir -p $(obj)include
@$(MKCONFIG) -a pm9g45 arm arm926ejs pm9g45 ronetix at91
######################################################################## ########################################################################
## ARM Integrator boards - see doc/README-integrator for more info. ## ARM Integrator boards - see doc/README-integrator for more info.
integratorap_config \ integratorap_config \

32
board/ronetix/pm9g45/pm9g45.c
Unescape View File

@ -29,16 +29,14 @@
#include <common.h> #include <common.h>
#include <asm/sizes.h> #include <asm/sizes.h>
#include <asm/arch/at91sam9g45.h> #include <asm/io.h>
#include <asm/arch/at91sam9_smc.h> #include <asm/arch/at91sam9_smc.h>
#include <asm/arch/at91_common.h> #include <asm/arch/at91_common.h>
#include <asm/arch/at91_pmc.h> #include <asm/arch/at91_pmc.h>
#include <asm/arch/at91_rstc.h> #include <asm/arch/at91_rstc.h>
#include <asm/arch/at91_matrix.h> #include <asm/arch/at91_matrix.h>
#include <asm/arch/at91_pio.h> #include <asm/arch/gpio.h>
#include <asm/arch/clk.h> #include <asm/arch/clk.h>
#include <asm/arch/io.h>
#include <asm/arch/hardware.h>
#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB) #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
#include <net.h> #include <net.h>
#endif #endif
@ -54,9 +52,9 @@ DECLARE_GLOBAL_DATA_PTR;
static void pm9g45_nand_hw_init(void) static void pm9g45_nand_hw_init(void)
{ {
unsigned long csa; unsigned long csa;
at91_smc_t *smc = (at91_smc_t *) AT91_SMC_BASE; struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC;
at91_matrix_t *matrix = (at91_matrix_t *) AT91_MATRIX_BASE; struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
/* Enable CS3 */ /* Enable CS3 */
csa = readl(&matrix->ccr[6]) | AT91_MATRIX_CSA_EBI_CS3A; csa = readl(&matrix->ccr[6]) | AT91_MATRIX_CSA_EBI_CS3A;
@ -80,7 +78,7 @@ static void pm9g45_nand_hw_init(void)
AT91_SMC_MODE_TDF_CYCLE(3), AT91_SMC_MODE_TDF_CYCLE(3),
&smc->cs[3].mode); &smc->cs[3].mode);
writel(1 << AT91SAM9G45_ID_PIOC, &pmc->pcer); writel(1 << ATMEL_ID_PIOC, &pmc->pcer);
#ifdef CONFIG_SYS_NAND_READY_PIN #ifdef CONFIG_SYS_NAND_READY_PIN
/* Configure RDY/BSY */ /* Configure RDY/BSY */
@ -95,7 +93,7 @@ static void pm9g45_nand_hw_init(void)
#ifdef CONFIG_MACB #ifdef CONFIG_MACB
static void pm9g45_macb_hw_init(void) static void pm9g45_macb_hw_init(void)
{ {
at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
/* /*
* PD2 enables the 50MHz oscillator for Ethernet PHY * PD2 enables the 50MHz oscillator for Ethernet PHY
@ -106,7 +104,7 @@ static void pm9g45_macb_hw_init(void)
at91_set_pio_value(AT91_PIO_PORTD, 2, 1); /* 1- enable, 0 - disable */ at91_set_pio_value(AT91_PIO_PORTD, 2, 1); /* 1- enable, 0 - disable */
/* Enable clock */ /* Enable clock */
writel(1 << AT91SAM9G45_ID_EMAC, &pmc->pcer); writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
/* /*
* Disable pull-up on: * Disable pull-up on:
@ -131,22 +129,22 @@ static void pm9g45_macb_hw_init(void)
int board_init(void) int board_init(void)
{ {
at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
/* Enable Ctrlc */ /* Enable Ctrlc */
console_init_f(); console_init_f();
writel((1 << AT91SAM9G45_ID_PIOA) | writel((1 << ATMEL_ID_PIOA) |
(1 << AT91SAM9G45_ID_PIOB) | (1 << ATMEL_ID_PIOB) |
(1 << AT91SAM9G45_ID_PIOC) | (1 << ATMEL_ID_PIOC) |
(1 << AT91SAM9G45_ID_PIODE), &pmc->pcer); (1 << ATMEL_ID_PIODE), &pmc->pcer);
/* arch number of AT91SAM9M10G45EK-Board */ /* arch number of AT91SAM9M10G45EK-Board */
gd->bd->bi_arch_number = MACH_TYPE_PM9G45; gd->bd->bi_arch_number = MACH_TYPE_PM9G45;
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
at91_serial_hw_init(); at91_seriald_hw_init();
#ifdef CONFIG_CMD_NAND #ifdef CONFIG_CMD_NAND
pm9g45_nand_hw_init(); pm9g45_nand_hw_init();
#endif #endif
@ -188,7 +186,7 @@ int board_eth_init(bd_t *bis)
{ {
int rc = 0; int rc = 0;
#ifdef CONFIG_MACB #ifdef CONFIG_MACB
rc = macb_eth_initialize(0, (void *)AT91_EMAC_BASE, 0x01); rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0x01);
#endif #endif
return rc; return rc;
} }

1
boards.cfg
Unescape View File

@ -124,6 +124,7 @@ otc570 arm arm926ejs otc570 esd
otc570_dataflash arm arm926ejs otc570 esd at91 otc570:AT91SAM9263,SYS_USE_DATAFLASH otc570_dataflash arm arm926ejs otc570 esd at91 otc570:AT91SAM9263,SYS_USE_DATAFLASH
pm9261 arm arm926ejs pm9261 ronetix at91 pm9261:AT91SAM9261 pm9261 arm arm926ejs pm9261 ronetix at91 pm9261:AT91SAM9261
pm9263 arm arm926ejs pm9263 ronetix at91 pm9263:AT91SAM9263 pm9263 arm arm926ejs pm9263 ronetix at91 pm9263:AT91SAM9263
pm9g45 arm arm926ejs pm9g45 ronetix at91 pm9g45:AT91SAM9G45
da830evm arm arm926ejs da8xxevm davinci davinci da830evm arm arm926ejs da8xxevm davinci davinci
da850evm arm arm926ejs da8xxevm davinci davinci da850evm arm arm926ejs da8xxevm davinci davinci
hawkboard arm arm926ejs da8xxevm davinci davinci hawkboard arm arm926ejs da8xxevm davinci davinci

16
include/configs/pm9g45.h
Unescape View File

@ -32,15 +32,20 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ /*
* SoC must be defined first, before hardware.h is included.
* In this case SoC is defined in boards.cfg.
*/
#include <asm/hardware.h>
#define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */ #define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */
#define CONFIG_AT91SAM9G45 1 /* It's an Atmel AT91SAM9G45 SoC */ #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45"
/* ARM asynchronous clock */ /* ARM asynchronous clock */
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_TEXT_BASE 0x73f00000 #define CONFIG_SYS_TEXT_BASE 0x73f00000
#define CONFIG_AT91FAMILY
#define CONFIG_ARCH_CPU_INIT #define CONFIG_ARCH_CPU_INIT
@ -55,7 +60,8 @@
*/ */
#define CONFIG_AT91_GPIO 1 #define CONFIG_AT91_GPIO 1
#define CONFIG_ATMEL_USART 1 #define CONFIG_ATMEL_USART 1
#define CONFIG_USART3 1 /* USART 3 is DBGU */ #define CONFIG_USART_BASE ATMEL_BASE_DBGU
#define CONFIG_USART_ID ATMEL_ID_SYS
#define CONFIG_SYS_USE_NANDFLASH 1 #define CONFIG_SYS_USE_NANDFLASH 1

Write Preview
Loading…
Cancel
Save