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

make pm9263 buildable for v2011.06 release

Browse Source 
Signed-off-by: Asen Chavdarov Dimov <dimov@ronetix.at>
master
Asen Dimov 13 years ago committed by Albert ARIBAUD
parent 58fb6020c1
commit 684a567ace
4 changed files with 35 additions and 35 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. 9
      board/ronetix/pm9263/led.c
  2. 42
      board/ronetix/pm9263/pm9263.c
  3. 2
      boards.cfg
  4. 17
      include/configs/pm9263.h

9
board/ronetix/pm9263/led.c
Unescape View File

@ -24,17 +24,16 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/arch/at91sam9263.h>
#include <asm/arch/at91_pmc.h> #include <asm/arch/at91_pmc.h>
#include <asm/arch/at91_pio.h> #include <asm/arch/gpio.h>
#include <asm/arch/io.h> #include <asm/io.h>
void coloured_LED_init(void) void coloured_LED_init(void)
{ {
at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
/* Enable clock */ /* Enable clock */
writel(1 << AT91SAM9263_ID_PIOB, &pmc->pcer); writel(1 << ATMEL_ID_PIOB, &pmc->pcer);
at91_set_pio_output(CONFIG_RED_LED, 1); at91_set_pio_output(CONFIG_RED_LED, 1);
at91_set_pio_output(CONFIG_GREEN_LED, 1); at91_set_pio_output(CONFIG_GREEN_LED, 1);

42
board/ronetix/pm9263/pm9263.c
Unescape View File

@ -26,16 +26,14 @@
#include <common.h> #include <common.h>
#include <asm/sizes.h> #include <asm/sizes.h>
#include <asm/arch/at91sam9263.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/clk.h> #include <asm/arch/clk.h>
#include <asm/arch/io.h> #include <asm/arch/gpio.h>
#include <asm/arch/hardware.h>
#include <lcd.h> #include <lcd.h>
#include <atmel_lcdc.h> #include <atmel_lcdc.h>
#include <dataflash.h> #include <dataflash.h>
@ -55,8 +53,8 @@ DECLARE_GLOBAL_DATA_PTR;
static void pm9263_nand_hw_init(void) static void pm9263_nand_hw_init(void)
{ {
unsigned long csa; unsigned long csa;
at91_smc_t *smc = (at91_smc_t *) AT91_SMC0_BASE; struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC0;
at91_matrix_t *matrix = (at91_matrix_t *) AT91_MATRIX_BASE; struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
/* Enable CS3 */ /* Enable CS3 */
csa = readl(&matrix->csa[0]) | AT91_MATRIX_CSA_EBI_CS3A; csa = readl(&matrix->csa[0]) | AT91_MATRIX_CSA_EBI_CS3A;
@ -95,7 +93,7 @@ static void pm9263_nand_hw_init(void)
#ifdef CONFIG_MACB #ifdef CONFIG_MACB
static void pm9263_macb_hw_init(void) static void pm9263_macb_hw_init(void)
{ {
at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
/* /*
* PB27 enables the 50MHz oscillator for Ethernet PHY * PB27 enables the 50MHz oscillator for Ethernet PHY
@ -106,7 +104,7 @@ static void pm9263_macb_hw_init(void)
at91_set_pio_value(AT91_PIO_PORTB, 27, 1); /* 1- enable, 0 - disable */ at91_set_pio_value(AT91_PIO_PORTB, 27, 1); /* 1- enable, 0 - disable */
/* Enable clock */ /* Enable clock */
writel(1 << AT91SAM9263_ID_EMAC, &pmc->pcer); writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
/* /*
* Disable pull-up on: * Disable pull-up on:
@ -145,7 +143,7 @@ vidinfo_t panel_info = {
vl_vsync_len: 1, vl_vsync_len: 1,
vl_upper_margin:1, vl_upper_margin:1,
vl_lower_margin:0, vl_lower_margin:0,
mmio: AT91SAM9263_LCDC_BASE, mmio: ATMEL_BASE_LCDC,
}; };
void lcd_enable(void) void lcd_enable(void)
@ -168,8 +166,8 @@ static int pm9263_lcd_hw_psram_init(void)
{ {
volatile uint16_t x; volatile uint16_t x;
unsigned long csa; unsigned long csa;
at91_smc_t *smc = (at91_smc_t *) AT91_SMC1_BASE; struct at91_smc *smc = (struct at91_smc *)ATMEL_BASE_SMC1;
at91_matrix_t *matrix = (at91_matrix_t *) AT91_MATRIX_BASE; struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
/* Enable CS3 3.3v, no pull-ups */ /* Enable CS3 3.3v, no pull-ups */
csa = readl(&matrix->csa[1]) | AT91_MATRIX_CSA_DBPUC | csa = readl(&matrix->csa[1]) | AT91_MATRIX_CSA_DBPUC |
@ -249,7 +247,7 @@ static int pm9263_lcd_hw_psram_init(void)
static void pm9263_lcd_hw_init(void) static void pm9263_lcd_hw_init(void)
{ {
at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
at91_set_a_periph(AT91_PIO_PORTC, 0, 0); /* LCDVSYNC */ at91_set_a_periph(AT91_PIO_PORTC, 0, 0); /* LCDVSYNC */
at91_set_a_periph(AT91_PIO_PORTC, 1, 0); /* LCDHSYNC */ at91_set_a_periph(AT91_PIO_PORTC, 1, 0); /* LCDHSYNC */
@ -275,7 +273,7 @@ static void pm9263_lcd_hw_init(void)
at91_set_a_periph(AT91_PIO_PORTC, 26, 0); /* LCDD22 */ at91_set_a_periph(AT91_PIO_PORTC, 26, 0); /* LCDD22 */
at91_set_a_periph(AT91_PIO_PORTC, 27, 0); /* LCDD23 */ at91_set_a_periph(AT91_PIO_PORTC, 27, 0); /* LCDD23 */
writel(1 << AT91SAM9263_ID_LCDC, &pmc->pcer); writel(1 << ATMEL_ID_LCDC, &pmc->pcer);
/* Power Control */ /* Power Control */
at91_set_pio_output(AT91_PIO_PORTA, 22, 1); at91_set_pio_output(AT91_PIO_PORTA, 22, 1);
@ -285,9 +283,9 @@ static void pm9263_lcd_hw_init(void)
/* initialize te PSRAM */ /* initialize te PSRAM */
int stat = pm9263_lcd_hw_psram_init(); int stat = pm9263_lcd_hw_psram_init();
gd->fb_base = (stat == 0) ? PHYS_PSRAM : AT91SAM9263_SRAM0_BASE; gd->fb_base = (stat == 0) ? PHYS_PSRAM : ATMEL_BASE_SRAM0;
#else #else
gd->fb_base = AT91SAM9263_SRAM0_BASE; gd->fb_base = ATMEL_BASE_SRAM0;
#endif #endif
} }
@ -341,14 +339,14 @@ void lcd_show_board_info(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 << AT91SAM9263_ID_PIOA) | writel((1 << ATMEL_ID_PIOA) |
(1 << AT91SAM9263_ID_PIOCDE) | (1 << ATMEL_ID_PIOCDE) |
(1 << AT91SAM9263_ID_PIOB), (1 << ATMEL_ID_PIOB),
&pmc->pcer); &pmc->pcer);
/* arch number of AT91SAM9263EK-Board */ /* arch number of AT91SAM9263EK-Board */
@ -357,7 +355,7 @@ int board_init(void)
/* 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
pm9263_nand_hw_init(); pm9263_nand_hw_init();
#endif #endif
@ -400,7 +398,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;
} }
@ -417,7 +415,7 @@ int checkboard (void)
ss = "(PSRAM)"; ss = "(PSRAM)";
break; break;
case AT91SAM9263_SRAM0_BASE: case ATMEL_BASE_SRAM0:
ss = "(Internal SRAM)"; ss = "(Internal SRAM)";
break; break;

2
boards.cfg
Unescape View File

@ -123,7 +123,7 @@ meesc_dataflash arm arm926ejs meesc esd
otc570 arm arm926ejs otc570 esd at91 otc570:AT91SAM9263,SYS_USE_NANDFLASH otc570 arm arm926ejs otc570 esd at91 otc570:AT91SAM9263,SYS_USE_NANDFLASH
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 - ronetix at91 pm9263 arm arm926ejs pm9263 ronetix at91 pm9263:AT91SAM9263
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

17
include/configs/pm9263.h
Unescape View File

@ -28,6 +28,12 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
/*
* SoC must be defined first, before hardware.h is included.
* In this case SoC is defined in boards.cfg.
*/
#include <asm/hardware.h>
/* ARM asynchronous clock */ /* ARM asynchronous clock */
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
@ -36,16 +42,15 @@
#define MASTER_PLL_MUL 65 #define MASTER_PLL_MUL 65
#define MAIN_PLL_DIV 2 /* 2 or 4 */ #define MAIN_PLL_DIV 2 /* 2 or 4 */
#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000 #define CONFIG_SYS_AT91_MAIN_CLOCK 18432000
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9263"
#define CONFIG_AT91SAM9263 1 /* It's an Atmel AT91SAM9263 SoC*/
#define CONFIG_PM9263 1 /* on a Ronetix PM9263 Board */ #define CONFIG_PM9263 1 /* on a Ronetix PM9263 Board */
#define CONFIG_ARCH_CPU_INIT #define CONFIG_ARCH_CPU_INIT
#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
#define CONFIG_SYS_TEXT_BASE 0 #define CONFIG_SYS_TEXT_BASE 0
#define CONFIG_AT91FAMILY
/* clocks */ /* clocks */
#define CONFIG_SYS_MOR_VAL \ #define CONFIG_SYS_MOR_VAL \
@ -170,10 +175,8 @@
*/ */
#define CONFIG_AT91_GPIO 1 #define CONFIG_AT91_GPIO 1
#define CONFIG_ATMEL_USART 1 #define CONFIG_ATMEL_USART 1
#undef CONFIG_USART0 #define CONFIG_USART_BASE ATMEL_BASE_DBGU
#undef CONFIG_USART1 #define CONFIG_USART_ID ATMEL_ID_SYS
#undef CONFIG_USART2
#define CONFIG_USART3 1 /* USART 3 is DBGU */
/* LCD */ /* LCD */
#define CONFIG_LCD 1 #define CONFIG_LCD 1

Write Preview
Loading…
Cancel
Save