summaryrefslogtreecommitdiff
path: root/include/configs/at91sam9260ek.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-05-09 20:11:36 (GMT)
committerTom Rini <trini@konsulko.com>2017-05-09 20:11:36 (GMT)
commitdd9999d5f4d3a0354c959fa3bccc0957a1164bf5 (patch)
tree7d37b3f93f256bc04e6f5492b20dbc2faeb8edb6 /include/configs/at91sam9260ek.h
parenta284212963277114ad60e3442d74f095102a9de5 (diff)
parent9d0c4decfeaa7e312f50e0debb677f60ad170f61 (diff)
downloadu-boot-dd9999d5f4d3a0354c959fa3bccc0957a1164bf5.tar.xz
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'include/configs/at91sam9260ek.h')
-rw-r--r--include/configs/at91sam9260ek.h31
1 files changed, 3 insertions, 28 deletions
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 379f234..48d7f6a 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -45,19 +45,6 @@
/* general purpose I/O */
#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO
-#define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */
-
-/* serial console */
-#define CONFIG_ATMEL_USART
-#define CONFIG_USART_BASE ATMEL_BASE_DBGU
-#define CONFIG_USART_ID ATMEL_ID_SYS
-
-/* LED */
-#define CONFIG_AT91_LED
-#define CONFIG_RED_LED AT91_PIN_PA9 /* this is the power led */
-#define CONFIG_GREEN_LED AT91_PIN_PA6 /* this is the user led */
-
/*
* BOOTP options
@@ -87,10 +74,10 @@
*/
#ifdef CONFIG_AT91SAM9XE
# define CONFIG_SYS_INIT_SP_ADDR \
- (ATMEL_BASE_SRAM + 0x1000 - GENERATED_GBL_DATA_SIZE)
+ (ATMEL_BASE_SRAM + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
#else
# define CONFIG_SYS_INIT_SP_ADDR \
- (ATMEL_BASE_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE)
+ (ATMEL_BASE_SRAM1 + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
#endif
/*
@@ -142,18 +129,6 @@
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13
#endif
-/* MMC */
-#ifdef CONFIG_CMD_MMC
-#define CONFIG_GENERIC_ATMEL_MCI
-#endif
-
-/* Ethernet */
-#define CONFIG_MACB 1
-#define CONFIG_RMII 1
-#define CONFIG_NET_RETRY_COUNT 20
-#define CONFIG_RESET_PHY_R 1
-#define CONFIG_AT91_WANTS_COMMON_PHY
-
/* USB */
#define CONFIG_USB_ATMEL
#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
@@ -200,7 +175,7 @@
/* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1
-#define CONFIG_ENV_OFFSET 0xc0000
+#define CONFIG_ENV_OFFSET 0x120000
#define CONFIG_ENV_OFFSET_REDUND 0x100000
#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x200000 0x300000; bootm"