diff options
| author | Stefano Babic <[email protected]> | 2014-12-30 13:04:09 +0100 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2014-12-30 13:04:38 +0100 |
| commit | 4e0114d9679173cfe8bfaffb8b4fb4bbf8cdaa10 (patch) | |
| tree | 2a909fd0434753a0e5b252afcda5aeb23f21ac26 /configs | |
| parent | 7ae350a0305de592faa8903255c988d4e6afb194 (diff) | |
| parent | 125738e819a3b9d15210794b3dcef9f4d9bcf866 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <[email protected]>
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/armadillo-800eva_defconfig | 2 | ||||
| -rw-r--r-- | configs/crownbay_defconfig | 6 | ||||
| -rw-r--r-- | configs/kzm9g_defconfig | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig index 9b17895623b..22dc1f8a417 100644 --- a/configs/armadillo-800eva_defconfig +++ b/configs/armadillo-800eva_defconfig @@ -1,3 +1,3 @@ CONFIG_ARM=y -+S:CONFIG_RMOBILE=y +CONFIG_RMOBILE=y CONFIG_TARGET_ARMADILLO_800EVA=y diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig new file mode 100644 index 00000000000..ce905539f99 --- /dev/null +++ b/configs/crownbay_defconfig @@ -0,0 +1,6 @@ +CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0xfff00000" +CONFIG_X86=y +CONFIG_TARGET_CROWNBAY=y +CONFIG_OF_CONTROL=y +CONFIG_OF_SEPARATE=y +CONFIG_DEFAULT_DEVICE_TREE="crownbay" diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig index d4d340f4bd9..20656dd61dd 100644 --- a/configs/kzm9g_defconfig +++ b/configs/kzm9g_defconfig @@ -1,3 +1,3 @@ CONFIG_ARM=y -+S:CONFIG_RMOBILE=y +CONFIG_RMOBILE=y CONFIG_TARGET_KZM9G=y |