diff options
author | Tom Rini <trini@konsulko.com> | 2015-05-30 20:16:01 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-05-30 20:16:01 -0400 |
commit | 43b1ff5f33456e85b2fccccaf2f9fe09821a45ac (patch) | |
tree | 0e75720408e20f807f250c7cf862c780f2a68b41 /configs | |
parent | b1f7ecc9b5f0ce07691f6804f436fcaa2a377b26 (diff) | |
parent | fcb2525d373f7a5bab213e8a89681bd3b7d09c44 (diff) | |
download | u-boot-imx-43b1ff5f33456e85b2fccccaf2f9fe09821a45ac.zip u-boot-imx-43b1ff5f33456e85b2fccccaf2f9fe09821a45ac.tar.gz u-boot-imx-43b1ff5f33456e85b2fccccaf2f9fe09821a45ac.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'configs')
-rw-r--r-- | configs/ph1_ld4_defconfig | 3 | ||||
-rw-r--r-- | configs/ph1_pro4_defconfig | 4 | ||||
-rw-r--r-- | configs/ph1_sld8_defconfig | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig index 036e2d1..82ce8c7 100644 --- a/configs/ph1_ld4_defconfig +++ b/configs/ph1_ld4_defconfig @@ -3,6 +3,8 @@ CONFIG_ARCH_UNIPHIER=y CONFIG_SPL_DM=y CONFIG_MACH_PH1_LD4=y CONFIG_PFC_MICRO_SUPPORT_CARD=y +CONFIG_NET=y +CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y @@ -30,6 +32,7 @@ CONFIG_CMD_TFTPPUT=y CONFIG_CMD_NFS=y CONFIG_CMD_PING=y CONFIG_CMD_TIME=y +CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig index 9a010ee..671d9cc 100644 --- a/configs/ph1_pro4_defconfig +++ b/configs/ph1_pro4_defconfig @@ -1,8 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y CONFIG_SPL_DM=y -CONFIG_MACH_PH1_PRO4=y CONFIG_PFC_MICRO_SUPPORT_CARD=y +CONFIG_NET=y +CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y @@ -30,6 +31,7 @@ CONFIG_CMD_TFTPPUT=y CONFIG_CMD_NFS=y CONFIG_CMD_PING=y CONFIG_CMD_TIME=y +CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig index 29fe0e8..3e763dc 100644 --- a/configs/ph1_sld8_defconfig +++ b/configs/ph1_sld8_defconfig @@ -3,6 +3,8 @@ CONFIG_ARCH_UNIPHIER=y CONFIG_SPL_DM=y CONFIG_MACH_PH1_SLD8=y CONFIG_PFC_MICRO_SUPPORT_CARD=y +CONFIG_NET=y +CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld8-ref" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y @@ -30,6 +32,7 @@ CONFIG_CMD_TFTPPUT=y CONFIG_CMD_NFS=y CONFIG_CMD_PING=y CONFIG_CMD_TIME=y +CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 |