Skip to content
Snippets Groups Projects
Commit 1acba334 authored by Albert ARIBAUD's avatar Albert ARIBAUD
Browse files

Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'

parents 76b40ab4 08f0533a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 79 additions and 62 deletions
arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c
+ 15
− 15
View file @ 1acba334
...@@ -61,20 +61,20 @@ char *get_cpu_name() ...@@ -61,20 +61,20 @@ char *get_cpu_name()
if (cpu_is_at91sam9x5()) { if (cpu_is_at91sam9x5()) {
switch (extension_id) { switch (extension_id) {
case ARCH_EXID_AT91SAM9G15: case ARCH_EXID_AT91SAM9G15:
return CONFIG_SYS_AT91_G15_CPU_NAME; return "AT91SAM9G15";
case ARCH_EXID_AT91SAM9G25: case ARCH_EXID_AT91SAM9G25:
return CONFIG_SYS_AT91_G25_CPU_NAME; return "AT91SAM9G25";
case ARCH_EXID_AT91SAM9G35: case ARCH_EXID_AT91SAM9G35:
return CONFIG_SYS_AT91_G35_CPU_NAME; return "AT91SAM9G35";
case ARCH_EXID_AT91SAM9X25: case ARCH_EXID_AT91SAM9X25:
return CONFIG_SYS_AT91_X25_CPU_NAME; return "AT91SAM9X25";
case ARCH_EXID_AT91SAM9X35: case ARCH_EXID_AT91SAM9X35:
return CONFIG_SYS_AT91_X35_CPU_NAME; return "AT91SAM9X35";
default: default:
return CONFIG_SYS_AT91_UNKNOWN_CPU; return "Unknown CPU type";
} }
} else { } else {
return CONFIG_SYS_AT91_UNKNOWN_CPU; return "Unknown CPU type";
} }
} }
...@@ -246,14 +246,14 @@ void at91_macb_hw_init(void) ...@@ -246,14 +246,14 @@ void at91_macb_hw_init(void)
#ifndef CONFIG_RMII #ifndef CONFIG_RMII
/* Only emac0 support MII */ /* Only emac0 support MII */
if (has_emac0()) { if (has_emac0()) {
at91_set_b_periph(AT91_PIO_PORTB, 16, 0); /* ECRS */ at91_set_a_periph(AT91_PIO_PORTB, 16, 0); /* ECRS */
at91_set_b_periph(AT91_PIO_PORTB, 17, 0); /* ECOL */ at91_set_a_periph(AT91_PIO_PORTB, 17, 0); /* ECOL */
at91_set_b_periph(AT91_PIO_PORTB, 13, 0); /* ERX2 */ at91_set_a_periph(AT91_PIO_PORTB, 13, 0); /* ERX2 */
at91_set_b_periph(AT91_PIO_PORTB, 14, 0); /* ERX3 */ at91_set_a_periph(AT91_PIO_PORTB, 14, 0); /* ERX3 */
at91_set_b_periph(AT91_PIO_PORTB, 15, 0); /* ERXCK */ at91_set_a_periph(AT91_PIO_PORTB, 15, 0); /* ERXCK */
at91_set_b_periph(AT91_PIO_PORTB, 11, 0); /* ETX2 */ at91_set_a_periph(AT91_PIO_PORTB, 11, 0); /* ETX2 */
at91_set_b_periph(AT91_PIO_PORTB, 12, 0); /* ETX3 */ at91_set_a_periph(AT91_PIO_PORTB, 12, 0); /* ETX3 */
at91_set_b_periph(AT91_PIO_PORTB, 8, 0); /* ETXER */ at91_set_a_periph(AT91_PIO_PORTB, 8, 0); /* ETXER */
} }
#endif #endif
} }
......
arch/arm/include/asm/arch-at91/at91sam9x5.h
+ 0
− 6
View file @ 1acba334
...@@ -140,12 +140,6 @@ ...@@ -140,12 +140,6 @@
/* /*
* Cpu Name * Cpu Name
*/ */
#define CONFIG_SYS_AT91_G15_CPU_NAME "AT91SAM9G15"
#define CONFIG_SYS_AT91_G25_CPU_NAME "AT91SAM9G25"
#define CONFIG_SYS_AT91_G35_CPU_NAME "AT91SAM9G35"
#define CONFIG_SYS_AT91_X25_CPU_NAME "AT91SAM9X25"
#define CONFIG_SYS_AT91_X35_CPU_NAME "AT91SAM9X35"
#define CONFIG_SYS_AT91_UNKNOWN_CPU "Unknown CPU type"
#define ATMEL_CPU_NAME get_cpu_name() #define ATMEL_CPU_NAME get_cpu_name()
/* /*
......
board/atmel/at91sam9260ek/at91sam9260ek.c
+ 6
− 1
View file @ 1acba334
...@@ -157,12 +157,17 @@ int board_early_init_f(void) ...@@ -157,12 +157,17 @@ int board_early_init_f(void)
int board_init(void) int board_init(void)
{ {
#ifdef CONFIG_AT91SAM9G20EK_2MMC
/* arch number of AT91SAM9G20EK_2MMC-Board */
gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK_2MMC;
#else
#ifdef CONFIG_AT91SAM9G20EK #ifdef CONFIG_AT91SAM9G20EK
/* arch number of AT91SAM9260EK-Board */ /* arch number of AT91SAM9G20EK-Board */
gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK; gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK;
#else #else
/* arch number of AT91SAM9260EK-Board */ /* arch number of AT91SAM9260EK-Board */
gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9260EK; gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9260EK;
#endif
#endif #endif
/* adress of boot parameters */ /* adress of boot parameters */
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
......
boards.cfg
+ 1
− 0
View file @ 1acba334
...@@ -95,6 +95,7 @@ at91sam9g10ek_nandflash arm arm926ejs at91sam9261ek atmel ...@@ -95,6 +95,7 @@ at91sam9g10ek_nandflash arm arm926ejs at91sam9261ek atmel
at91sam9g20ek_dataflash_cs0 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS0 at91sam9g20ek_dataflash_cs0 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS0
at91sam9g20ek_dataflash_cs1 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS1 at91sam9g20ek_dataflash_cs1 arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,SYS_USE_DATAFLASH_CS1
at91sam9g20ek_nandflash arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,SYS_USE_NANDFLASH at91sam9g20ek_nandflash arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,SYS_USE_NANDFLASH
at91sam9g20ek_2mmc_nandflash arm arm926ejs at91sam9260ek atmel at91 at91sam9260ek:AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH
at91sam9m10g45ek_nandflash arm arm926ejs at91sam9m10g45ek atmel at91 at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH at91sam9m10g45ek_nandflash arm arm926ejs at91sam9m10g45ek atmel at91 at91sam9m10g45ek:AT91SAM9M10G45,SYS_USE_NANDFLASH
at91sam9rlek_dataflash arm arm926ejs at91sam9rlek atmel at91 at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH at91sam9rlek_dataflash arm arm926ejs at91sam9rlek atmel at91 at91sam9rlek:AT91SAM9RL,SYS_USE_DATAFLASH
at91sam9rlek_nandflash arm arm926ejs at91sam9rlek atmel at91 at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH at91sam9rlek_nandflash arm arm926ejs at91sam9rlek atmel at91 at91sam9rlek:AT91SAM9RL,SYS_USE_NANDFLASH
......
include/configs/at91rm9200ek.h
+ 3
− 0
View file @ 1acba334
...@@ -75,6 +75,9 @@ ...@@ -75,6 +75,9 @@
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_CMD_BOOTZ
#define CONFIG_OF_LIBFDT
/* /*
* Memory Configuration * Memory Configuration
*/ */
......
include/configs/at91sam9260ek.h
+ 14
− 9
View file @ 1acba334
...@@ -62,6 +62,9 @@ ...@@ -62,6 +62,9 @@
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_CMD_BOOTZ
#define CONFIG_OF_LIBFDT
/* general purpose I/O */ /* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
#define CONFIG_AT91_GPIO #define CONFIG_AT91_GPIO
...@@ -126,6 +129,7 @@ ...@@ -126,6 +129,7 @@
#endif #endif
/* DataFlash */ /* DataFlash */
#ifndef CONFIG_AT91SAM9G20EK_2MMC
#define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_ATMEL_DATAFLASH_SPI
#define CONFIG_HAS_DATAFLASH 1 #define CONFIG_HAS_DATAFLASH 1
#define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) #define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ)
...@@ -133,6 +137,7 @@ ...@@ -133,6 +137,7 @@
#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */ #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */
#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 0xD0000000 /* CS1 */ #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 0xD0000000 /* CS1 */
#define AT91_SPI_CLK 15000000 #define AT91_SPI_CLK 15000000
#endif
#ifdef CONFIG_AT91SAM9G20EK #ifdef CONFIG_AT91SAM9G20EK
#define DATAFLASH_TCSS (0x22 << 16) #define DATAFLASH_TCSS (0x22 << 16)
...@@ -210,16 +215,16 @@ ...@@ -210,16 +215,16 @@
/* bootstrap + u-boot + env + linux in nandflash */ /* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_OFFSET 0x60000 #define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x80000 #define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS \
"root=/dev/mtdblock5 " \ "console=ttyS0,115200 earlyprintk " \
"mtdparts=atmel_nand:128k(bootstrap)ro," \ "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \
"256k(uboot)ro,128k(env1)ro," \ "256k(env),256k(env_redundant),256k(spare)," \
"128k(env2)ro,2M(linux),-(root) " \ "512k(dtb),6M(kernel)ro,-(rootfs) " \
"rw rootfstype=jffs2" "root=/dev/mtdblock7 rw rootfstype=jffs2"
#endif #endif
......
include/configs/at91sam9261ek.h
+ 9
− 10
View file @ 1acba334
...@@ -212,17 +212,16 @@ ...@@ -212,17 +212,16 @@
/* bootstrap + u-boot + env + linux in nandflash */ /* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x60000 #define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x80000 #define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS \
"root=/dev/mtdblock5 " \ "console=ttyS0,115200 earlyprintk " \
"mtdparts=atmel_nand:128k(bootstrap)ro," \ "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \
"256k(uboot)ro,128k(env1)ro," \ "256k(env),256k(env_redundant),256k(spare)," \
"128k(env2)ro,2M(linux),-(root) " \ "512k(dtb),6M(kernel)ro,-(rootfs) " \
"rw rootfstype=jffs2" "root=/dev/mtdblock7 rw rootfstype=jffs2"
#endif #endif
#define CONFIG_SYS_PROMPT "U-Boot> " #define CONFIG_SYS_PROMPT "U-Boot> "
......
include/configs/at91sam9263ek.h
+ 12
− 8
View file @ 1acba334
...@@ -62,6 +62,9 @@ ...@@ -62,6 +62,9 @@
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_CMD_BOOTZ
#define CONFIG_OF_LIBFDT
/* /*
* Hardware drivers * Hardware drivers
*/ */
...@@ -324,15 +327,16 @@ ...@@ -324,15 +327,16 @@
/* bootstrap + u-boot + env + linux in nandflash */ /* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_IS_IN_NAND 1
#define CONFIG_ENV_OFFSET 0x60000 #define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x80000 #define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm" #define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \ #define CONFIG_BOOTARGS \
"root=/dev/mtdblock5 " \ "console=ttyS0,115200 earlyprintk " \
"mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) " \ "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \
"rw rootfstype=jffs2" "256k(env),256k(env_redundant),256k(spare)," \
"512k(dtb),6M(kernel)ro,-(rootfs) " \
"root=/dev/mtdblock7 rw rootfstype=jffs2"
#endif #endif
#define CONFIG_SYS_PROMPT "U-Boot> " #define CONFIG_SYS_PROMPT "U-Boot> "
......
include/configs/at91sam9m10g45ek.h
+ 9
− 8
View file @ 1acba334
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_CMD_BOOTZ
#define CONFIG_OF_LIBFDT #define CONFIG_OF_LIBFDT
/* general purpose I/O */ /* general purpose I/O */
...@@ -149,19 +150,19 @@ ...@@ -149,19 +150,19 @@
/* bootstrap + u-boot + env in nandflash */ /* bootstrap + u-boot + env in nandflash */
#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x60000 #define CONFIG_ENV_OFFSET 0xc0000
#define CONFIG_ENV_OFFSET_REDUND 0x80000 #define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000
#define CONFIG_BOOTCOMMAND "nand read 0x70000000 0x100000 0x200000;" \ #define CONFIG_BOOTCOMMAND \
"nand read 0x70000000 0x200000 0x300000;" \
"bootm 0x70000000" "bootm 0x70000000"
#define CONFIG_BOOTARGS \ #define CONFIG_BOOTARGS \
"console=ttyS0,115200 earlyprintk " \ "console=ttyS0,115200 earlyprintk " \
"root=/dev/mtdblock5 " \ "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \
"mtdparts=atmel_nand:128k(bootstrap)ro," \ "256k(env),256k(env_redundant),256k(spare)," \
"256k(uboot)ro,128k(env1)ro,128k(env2)ro," \ "512k(dtb),6M(kernel)ro,-(rootfs) " \
"2M@1M(linux),-(root) " \ "root=/dev/mtdblock7 rw rootfstype=jffs2"
"rw rootfstype=jffs2"
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
......
include/configs/at91sam9rlek.h
+ 3
− 0
View file @ 1acba334
...@@ -48,6 +48,9 @@ ...@@ -48,6 +48,9 @@
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_CMD_BOOTZ
#define CONFIG_OF_LIBFDT
#define CONFIG_ATMEL_LEGACY #define CONFIG_ATMEL_LEGACY
#define CONFIG_AT91_GPIO 1 #define CONFIG_AT91_GPIO 1
#define CONFIG_AT91_GPIO_PULLUP 1 #define CONFIG_AT91_GPIO_PULLUP 1
......
include/configs/at91sam9x5ek.h
+ 7
− 5
View file @ 1acba334
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_CMD_BOOTZ
#define CONFIG_OF_LIBFDT #define CONFIG_OF_LIBFDT
/* general purpose I/O */ /* general purpose I/O */
...@@ -231,11 +232,12 @@ ...@@ -231,11 +232,12 @@
"root=/dev/mmcblk0p2 " \ "root=/dev/mmcblk0p2 " \
"rw rootfstype=ext4 rootwait" "rw rootfstype=ext4 rootwait"
#else #else
#define CONFIG_BOOTARGS "mem=128M console=ttyS0,115200 " \ #define CONFIG_BOOTARGS \
"mtdparts=atmel_nand:" \ "console=ttyS0,115200 earlyprintk " \
"8M(bootstrap/uboot/kernel)ro,-(rootfs) " \ "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \
"root=/dev/mtdblock1 rw " \ "256k(env),256k(env_redundant),256k(spare)," \
"rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs" "512k(dtb),6M(kernel)ro,-(rootfs) " \
"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw"
#endif #endif
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment