X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fnovena.h;h=b648c7bc8682937abd5e0998c189c7e801034546;hb=d584648dad691caec3ecc7777dbfa3f1936878e5;hp=cdc437c4925fa232324e308585d64aa3aff753ca;hpb=54869e0811b341f95458c509fd565e3c4bab6a01;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/novena.h b/include/configs/novena.h index cdc437c..b648c7b 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -18,20 +18,12 @@ /* U-Boot general configurations */ /* U-Boot environment */ -#define CONFIG_ENV_SIZE (16 * 1024) /* * Environment is on MMC, starting at offset 512KiB from start of the card. * Please place first partition at offset 1MiB from the start of the card * as recommended by GNU/fdisk. See below for details: * http://homepage.ntlworld.com./jonathan.deboynepollard/FGA/disc-partition-alignment.html */ -#ifdef CONFIG_CMD_MMC -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_ENV_OFFSET (512 * 1024) -#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE -#define CONFIG_ENV_OFFSET_REDUND \ - (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#endif /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" @@ -49,22 +41,14 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#define CONFIG_SYS_MEMTEST_START 0x10000000 -#define CONFIG_SYS_MEMTEST_END 0x20000000 - #define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) /* SPL */ #include "imx6_spl.h" /* common IMX6 SPL configuration */ /* Ethernet Configuration */ -#ifdef CONFIG_CMD_NET -#define CONFIG_FEC_MXC -#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII -#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0x7 -#define CONFIG_ARP_TIMEOUT 200UL +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_DM_ETH #endif /* I2C */ @@ -105,7 +89,6 @@ #define CONFIG_LBA48 /* UART */ -#define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE /* USB Configs */ @@ -115,12 +98,10 @@ #define CONFIG_MXC_USB_FLAGS 0 /* Gadget part */ #define CONFIG_USBD_HS -#define CONFIG_NETCONSOLE #endif /* Video output */ #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_IMX_HDMI