projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into next
[platform/kernel/u-boot.git]
/
include
/
configs
/
lx2160aqds.h
diff --git
a/include/configs/lx2160aqds.h
b/include/configs/lx2160aqds.h
index
a07ebeb
..
3a316e7
100644
(file)
--- a/
include/configs/lx2160aqds.h
+++ b/
include/configs/lx2160aqds.h
@@
-9,29
+9,12
@@
#include "lx2160a_common.h"
/* RTC */
#include "lx2160a_common.h"
/* RTC */
-#define CONFIG_SYS_RTC_BUS_NUM 0
-
-/*
- * MMC
- */
-#ifdef CONFIG_MMC
-#ifndef __ASSEMBLY__
-u8 qixis_esdhc_detect_quirk(void);
-#endif
-#define CONFIG_ESDHC_DETECT_QUIRK qixis_esdhc_detect_quirk()
-#endif
+#define CFG_SYS_RTC_BUS_NUM 0
/* MAC/PHY configuration */
/* MAC/PHY configuration */
-#if defined(CONFIG_FSL_MC_ENET)
-#define CONFIG_ETHPRIME "DPMAC17@rgmii-id"
-#endif
-
-/* EEPROM */
-#define CONFIG_SYS_I2C_EEPROM_NXID
-#define CONFIG_SYS_EEPROM_BUS_NUM 0
/* Initial environment variables */
/* Initial environment variables */
-#define C
ONFIG_EXTRA_ENV_SETTINGS
\
+#define C
FG_EXTRA_ENV_SETTINGS
\
EXTRA_ENV_SETTINGS \
"boot_scripts=lx2160aqds_boot.scr\0" \
"boot_script_hdr=hdr_lx2160aqds_bs.out\0" \
EXTRA_ENV_SETTINGS \
"boot_scripts=lx2160aqds_boot.scr\0" \
"boot_script_hdr=hdr_lx2160aqds_bs.out\0" \