X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fam43xx_evm.h;h=8355b4abc0f69bd7658133f0bbd564597f16f5a4;hb=f9a48654ee70fbad29f487d074fd36a1548b4209;hp=487083294cea548869ad473d806b996a8f7e1b13;hpb=47b48fe186ad26740f97016d93e991f51447ddd6;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 4870832..8355b4a 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -192,9 +192,6 @@ #ifndef CONFIG_SPL_BUILD /* CPSW Ethernet */ -#define CONFIG_BOOTP_DEFAULT -#define CONFIG_BOOTP_DNS2 -#define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_NET_RETRY_COUNT 10 #endif @@ -203,7 +200,7 @@ #define CONFIG_SYS_RX_ETH_BUFFER 64 /* NAND support */ -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND /* NAND: device related configs */ #define CONFIG_SYS_NAND_PAGE_SIZE 4096 #define CONFIG_SYS_NAND_OOBSIZE 224 @@ -260,10 +257,10 @@ "nand read ${loadaddr} NAND.kernel; " \ "bootz ${loadaddr} - ${fdtaddr}\0" #define NANDBOOT "run nandboot; " -#else /* !CONFIG_NAND */ +#else /* !CONFIG_MTD_RAW_NAND */ #define NANDARGS #define NANDBOOT -#endif /* CONFIG_NAND */ +#endif /* CONFIG_MTD_RAW_NAND */ #if defined(CONFIG_TI_SECURE_DEVICE) /* Avoid relocating onto firewalled area at end of DRAM */