make pm9g45 buildable for v2011.06 release

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

diff --git a/MAKEALL b/MAKEALL
index 7e748d60f9417a1b7be645331fe0dfdd41bae5f8..dd6b1fc04ba89ab857c3ef004b8732845030f72f 100755 (executable)
--- a/MAKEALL
+++ b/MAKEALL
@@ -445,7 +445,6 @@ LIST_ARMV7="                \
 
 LIST_at91="$(boards_by_soc at91)\
        at91sam9m10g45ek        \
-       pm9g45                  \
 "
 
 #########################################################################

diff --git a/Makefile b/Makefile
index f478ec6053575c6a70fffd5f52aafe3acf15c925..b71022cf55aee6d9f2a096e3c73b449d7f7697c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -823,10 +823,6 @@ at91sam9g45ekes_config     :       unconfig
        fi;
        @$(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.
 integratorap_config    \

diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c
index fa69599e909ae3e7f7090b7a6418a86a72f7cbeb..f3374a44298af5fb8180c895cd36221dad1d6157 100644 (file)
--- a/board/ronetix/pm9g45/pm9g45.c
+++ b/board/ronetix/pm9g45/pm9g45.c
@@ -29,16 +29,14 @@
 
 #include <common.h>
 #include <asm/sizes.h>
-#include <asm/arch/at91sam9g45.h>
+#include <asm/io.h>
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_rstc.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/io.h>
-#include <asm/arch/hardware.h>
 #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
 #include <net.h>
 #endif
@@ -54,9 +52,9 @@ DECLARE_GLOBAL_DATA_PTR;
 static void pm9g45_nand_hw_init(void)
 {
        unsigned long csa;
-       at91_smc_t      *smc    = (at91_smc_t *) AT91_SMC_BASE;
-       at91_matrix_t   *matrix = (at91_matrix_t *) AT91_MATRIX_BASE;
-       at91_pmc_t      *pmc    = (at91_pmc_t *) AT91_PMC_BASE;
+       struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC;
+       struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
+       struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
 
        /* Enable CS3 */
        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),
                &smc->cs[3].mode);
 
-       writel(1 << AT91SAM9G45_ID_PIOC, &pmc->pcer);
+       writel(1 << ATMEL_ID_PIOC, &pmc->pcer);
 
 #ifdef CONFIG_SYS_NAND_READY_PIN
        /* Configure RDY/BSY */
@@ -95,7 +93,7 @@ static void pm9g45_nand_hw_init(void)
 #ifdef CONFIG_MACB
 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
@@ -106,7 +104,7 @@ static void pm9g45_macb_hw_init(void)
        at91_set_pio_value(AT91_PIO_PORTD, 2, 1); /* 1- enable, 0 - disable */
 
        /* Enable clock */
-       writel(1 << AT91SAM9G45_ID_EMAC, &pmc->pcer);
+       writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
 
        /*
         * Disable pull-up on:
@@ -131,22 +129,22 @@ static void pm9g45_macb_hw_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 */
        console_init_f();
 
-       writel((1 << AT91SAM9G45_ID_PIOA) |
-               (1 << AT91SAM9G45_ID_PIOB) |
-               (1 << AT91SAM9G45_ID_PIOC) |
-               (1 << AT91SAM9G45_ID_PIODE), &pmc->pcer);
+       writel((1 << ATMEL_ID_PIOA) |
+               (1 << ATMEL_ID_PIOB) |
+               (1 << ATMEL_ID_PIOC) |
+               (1 << ATMEL_ID_PIODE), &pmc->pcer);
 
        /* 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_serial_hw_init();
+       at91_seriald_hw_init();
 #ifdef CONFIG_CMD_NAND
        pm9g45_nand_hw_init();
 #endif
@@ -188,7 +186,7 @@ int board_eth_init(bd_t *bis)
 {
        int rc = 0;
 #ifdef CONFIG_MACB
-       rc = macb_eth_initialize(0, (void *)AT91_EMAC_BASE, 0x01);
+       rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0x01);
 #endif
        return rc;
 }

diff --git a/boards.cfg b/boards.cfg
index 716435466eb6d17cb5a8a381bc203d7bc44180ec..48b7592962a541562fe659cfe25b794575348157 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -124,6 +124,7 @@ otc570                       arm         arm926ejs   otc570              esd
 otc570_dataflash             arm         arm926ejs   otc570              esd            at91        otc570:AT91SAM9263,SYS_USE_DATAFLASH
 pm9261                       arm         arm926ejs   pm9261              ronetix        at91        pm9261:AT91SAM9261
 pm9263                       arm         arm926ejs   pm9263              ronetix        at91        pm9263:AT91SAM9263
+pm9g45                       arm         arm926ejs   pm9g45              ronetix        at91        pm9g45:AT91SAM9G45
 da830evm                     arm         arm926ejs   da8xxevm            davinci        davinci
 da850evm                     arm         arm926ejs   da8xxevm            davinci        davinci
 hawkboard                    arm         arm926ejs   da8xxevm            davinci        davinci

diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index ec51ccf062e7dd4ea92afcef5d0b8fc7d27c1494..672f66345a196320d1cf94a25f5a7624e05c2d4e 100644 (file)
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -32,15 +32,20 @@
 #ifndef __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_AT91SAM9G45     1       /* It's an Atmel AT91SAM9G45 SoC */
+#define CONFIG_SYS_AT91_CPU_NAME       "AT91SAM9G45"
 
 /* ARM asynchronous clock */
 #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_TEXT_BASE   0x73f00000
-#define CONFIG_AT91FAMILY
+#define CONFIG_SYS_TEXT_BASE           0x73f00000
 
 #define CONFIG_ARCH_CPU_INIT
 
@@ -55,7 +60,8 @@
  */
 #define CONFIG_AT91_GPIO       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