diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-28 14:14:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-28 14:14:18 -0400 |
| commit | 1df182ddf700de49fb4400ba67c3029278ea88e7 (patch) | |
| tree | c709e8a79950a29f1d12fc09fbf52b293bd54092 /include | |
| parent | 4f892924d238cc415891dbea336a0fdaff2f853b (diff) | |
| parent | 0eafd4b77615efdd948e698d83be746dcf026a53 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/at91-sama5_common.h | 2 | ||||
| -rw-r--r-- | include/configs/at91sam9rlek.h | 2 | ||||
| -rw-r--r-- | include/configs/sama5d2_xplained.h | 31 |
3 files changed, 9 insertions, 26 deletions
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index b09ef33e57..13140bae1f 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -74,7 +74,7 @@ #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk " \ "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256K(env),256k(env_redundent),256k(spare)," \ + "256K(env),256k(env_redundant),256k(spare)," \ "512k(dtb),6M(kernel)ro,-(rootfs) " \ "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 5b3a3d1b48..23184ceba0 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -148,7 +148,7 @@ #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk " \ "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \ - "256K(env),256k(env_redundent),256k(spare)," \ + "256K(env),256k(env_redundant),256k(spare)," \ "512k(dtb),6M(kernel)ro,-(rootfs) " \ "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs" diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 30fb9a4dfb..f6946453e5 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -15,10 +15,9 @@ #include "at91-sama5_common.h" -/* serial console */ -#define CONFIG_ATMEL_USART -#define CONFIG_USART_BASE ATMEL_BASE_UART1 -#define CONFIG_USART_ID ATMEL_ID_UART1 +#define CONFIG_BOARD_EARLY_INIT_F + +#define CONFIG_MISC_INIT_R /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 @@ -34,14 +33,8 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ -#undef CONFIG_AT91_GPIO -#define CONFIG_ATMEL_PIO4 - /* SerialFlash */ #ifdef CONFIG_CMD_SF -#define CONFIG_ATMEL_SPI -#define CONFIG_ATMEL_SPI0 -#define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 30000000 @@ -51,23 +44,9 @@ #undef CONFIG_CMD_NAND /* MMC */ - #ifdef CONFIG_CMD_MMC -#define CONFIG_MMC #define CONFIG_GENERIC_MMC #define CONFIG_SDHCI -#define CONFIG_ATMEL_SDHCI -#define CONFIG_ATMEL_SDHCI0 -#define CONFIG_ATMEL_SDHCI1 -#define CONFIG_SUPPORT_EMMC_BOOT -#endif - -/* USB */ - -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI -#define CONFIG_USB_EHCI_ATMEL -#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #endif /* USB device */ @@ -79,6 +58,10 @@ #define CONFIG_DOS_PARTITION #endif +/* I2C */ +#define AT24MAC_ADDR 0x5c +#define AT24MAC_REG 0x9a + /* Ethernet Hardware */ #define CONFIG_MACB #define CONFIG_RMII |