diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-09-22 15:51:01 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-09-22 15:51:01 +0200 |
| commit | 42817eb85de1d7dec399c75dbd133ea6b5351a72 (patch) | |
| tree | cf93368fd5642cc995055f764103f85d7abbedf1 /configs | |
| parent | 7a56bddd7fb9fe27c775cadd18ebde6f883d7cff (diff) | |
| parent | 2a8c9c86b92a9ccee3c27286de317e19bb0530b3 (diff) | |
| download | blackbird-obmc-uboot-42817eb85de1d7dec399c75dbd133ea6b5351a72.tar.gz blackbird-obmc-uboot-42817eb85de1d7dec399c75dbd133ea6b5351a72.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/ls1021aqds_nor_defconfig | 2 | ||||
| -rw-r--r-- | configs/ls1021atwr_nor_defconfig | 2 | ||||
| -rw-r--r-- | configs/ls2085a_emu_D4_defconfig | 2 | ||||
| -rw-r--r-- | configs/ls2085a_emu_defconfig | 2 | ||||
| -rw-r--r-- | configs/ls2085a_simu_defconfig | 2 | ||||
| -rw-r--r-- | configs/vexpress_aemv8a_defconfig | 1 | ||||
| -rw-r--r-- | configs/vexpress_aemv8a_semi_defconfig | 4 |
7 files changed, 9 insertions, 6 deletions
diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig new file mode 100644 index 0000000000..9e42d61095 --- /dev/null +++ b/configs/ls1021aqds_nor_defconfig @@ -0,0 +1,2 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1021AQDS=y diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig new file mode 100644 index 0000000000..5f465d3100 --- /dev/null +++ b/configs/ls1021atwr_nor_defconfig @@ -0,0 +1,2 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1021ATWR=y diff --git a/configs/ls2085a_emu_D4_defconfig b/configs/ls2085a_emu_D4_defconfig index f2f6882c99..0bc36ed0b0 100644 --- a/configs/ls2085a_emu_D4_defconfig +++ b/configs/ls2085a_emu_D4_defconfig @@ -1,3 +1,3 @@ -CONFIG_SYS_EXTRA_OPTIONS="ARM64,EMU,SYS_FSL_DDR4" +CONFIG_SYS_EXTRA_OPTIONS="EMU,SYS_FSL_DDR4" CONFIG_ARM=y CONFIG_TARGET_LS2085A_EMU=y diff --git a/configs/ls2085a_emu_defconfig b/configs/ls2085a_emu_defconfig index 51ffa56a4c..a2efec3ccf 100644 --- a/configs/ls2085a_emu_defconfig +++ b/configs/ls2085a_emu_defconfig @@ -1,3 +1,3 @@ -CONFIG_SYS_EXTRA_OPTIONS="ARM64,EMU" +CONFIG_SYS_EXTRA_OPTIONS="EMU" CONFIG_ARM=y CONFIG_TARGET_LS2085A_EMU=y diff --git a/configs/ls2085a_simu_defconfig b/configs/ls2085a_simu_defconfig index efa8e74548..7563a7546e 100644 --- a/configs/ls2085a_simu_defconfig +++ b/configs/ls2085a_simu_defconfig @@ -1,3 +1,3 @@ -CONFIG_SYS_EXTRA_OPTIONS="ARM64,SIMU" +CONFIG_SYS_EXTRA_OPTIONS="SIMU" CONFIG_ARM=y CONFIG_TARGET_LS2085A_SIMU=y diff --git a/configs/vexpress_aemv8a_defconfig b/configs/vexpress_aemv8a_defconfig index a335abcf78..9e0a1755a0 100644 --- a/configs/vexpress_aemv8a_defconfig +++ b/configs/vexpress_aemv8a_defconfig @@ -1,3 +1,2 @@ -CONFIG_SYS_EXTRA_OPTIONS="ARM64" CONFIG_ARM=y CONFIG_TARGET_VEXPRESS_AEMV8A=y diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig index e6dd8e7224..8fdf4e0fab 100644 --- a/configs/vexpress_aemv8a_semi_defconfig +++ b/configs/vexpress_aemv8a_semi_defconfig @@ -1,3 +1,3 @@ -CONFIG_SYS_EXTRA_OPTIONS="ARM64,SEMIHOSTING,BASE_FVP" +CONFIG_SYS_EXTRA_OPTIONS="SEMIHOSTING,BASE_FVP" CONFIG_ARM=y -CONFIG_TARGET_VEXPRESS_AEMV8A_SEMI=y +CONFIG_TARGET_VEXPRESS_AEMV8A=y |
