X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fsama5d3xek.h;h=ca1c2b0861a3823c695672db147726d25229e822;hb=d01806a8fcbdaedcc67cead56ece572021d97ab7;hp=83b527c0de5c28d636fa1fe15258c72036515f1a;hpb=8f1a80e99e4a838d1540cdb1d59ccc7785fe4618;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 83b527c..ca1c2b0 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Configuation settings for the SAMA5D3xEK board. * @@ -6,8 +7,6 @@ * based on at91sam9m10g45ek.h by: * Stelian Pop * Lead Tech Design - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H @@ -15,44 +14,29 @@ #include "at91-sama5_common.h" -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - /* * This needs to be defined for the OHCI code to work but it is defined as * ATMEL_ID_UHPHS in the CPU specific header files. */ -#define ATMEL_ID_UHP ATMEL_ID_UHPHS +#define ATMEL_ID_UHP 32 /* * Specify the clock enable bit in the PMC_SCER register. */ -#define ATMEL_PMC_UHP AT91SAM926x_PMC_UHP - -/* LCD */ -#define LCD_BPP LCD_COLOR16 -#define LCD_OUTPUT_BPP 24 -#define CONFIG_LCD_LOGO -#define CONFIG_LCD_INFO -#define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_ATMEL_HLCD -#define CONFIG_ATMEL_LCD_RGB565 +#define ATMEL_PMC_UHP (1 << 6) /* board specific (not enough SRAM) */ #define CONFIG_SAMA5D3_LCD_BASE 0x23E00000 /* NOR flash */ #ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_FLASH_CFI_DRIVER -#define CONFIG_SYS_FLASH_CFI -#define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_SYS_FLASH_BASE 0x10000000 #define CONFIG_SYS_MAX_FLASH_SECT 131 #define CONFIG_SYS_MAX_FLASH_BANKS 1 #endif /* SDRAM */ -#define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_DDRCS +#define CONFIG_SYS_SDRAM_BASE 0x20000000 #define CONFIG_SYS_SDRAM_SIZE 0x20000000 #ifdef CONFIG_SPL_BUILD @@ -70,25 +54,16 @@ /* NAND flash */ #ifdef CONFIG_CMD_NAND -#define CONFIG_NAND_ATMEL #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE ATMEL_BASE_CS3 +#define CONFIG_SYS_NAND_BASE 0x60000000 /* our ALE is AD21 */ #define CONFIG_SYS_NAND_MASK_ALE (1 << 21) /* our CLE is AD22 */ #define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_ONFI_DETECTION #endif -/* PMECC & PMERRLOC */ -#define CONFIG_ATMEL_NAND_HWECC -#define CONFIG_ATMEL_NAND_HW_PMECC -#define CONFIG_PMECC_CAP 4 -#define CONFIG_PMECC_SECTOR_SIZE 512 - -#define CONFIG_PHY_MICREL_KSZ9021 /* USB */ - #ifdef CONFIG_CMD_USB #define CONFIG_USB_ATMEL_CLK_SEL_UPLL #define CONFIG_USB_OHCI_NEW @@ -100,16 +75,7 @@ #define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ -#ifdef CONFIG_SYS_USE_SERIALFLASH -/* override the bootcmd, bootargs and other configuration for spi flash env*/ -#elif CONFIG_SYS_USE_NANDFLASH -/* override the bootcmd, bootargs and other configuration nandflash env */ -#elif CONFIG_SYS_USE_MMC -/* override the bootcmd, bootargs and other configuration for sd/mmc env */ -#endif - /* SPL */ -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x300000 #define CONFIG_SPL_MAX_SIZE 0x18000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 @@ -119,14 +85,17 @@ #define CONFIG_SYS_MONITOR_LEN (512 << 10) -#ifdef CONFIG_SYS_USE_MMC -#define CONFIG_SPL_LDSCRIPT arch/arm/mach-at91/armv7/u-boot-spl.lds +#ifdef CONFIG_SD_BOOT #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#elif CONFIG_SYS_USE_NANDFLASH +#elif CONFIG_SPI_BOOT +#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 + +#elif CONFIG_NAND_BOOT #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_BASE +#endif #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_SIZE 0x800 @@ -134,12 +103,5 @@ #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE 0x20000 #define CONFIG_SYS_NAND_BAD_BLOCK_POS 0x0 -#define CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER - -#elif CONFIG_SYS_USE_SERIALFLASH -#define CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x10000 - -#endif #endif