diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-10 08:56:01 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-10 08:56:01 +0200 |
| commit | ebf8644a113a36b163c2e06fe1e081c73f563c3a (patch) | |
| tree | bdb14d7e33d6c2d1b7a803508e0f45eef301fb7a /configs | |
| parent | 7d2f669b94aa42579b5d5775dfb076bce0102e3f (diff) | |
| parent | b219773957d2ee8fedb56f0fcb19288eb72d4867 (diff) | |
| download | u-boot-ebf8644a113a36b163c2e06fe1e081c73f563c3a.zip u-boot-ebf8644a113a36b163c2e06fe1e081c73f563c3a.tar.gz u-boot-ebf8644a113a36b163c2e06fe1e081c73f563c3a.tar.bz2 | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/s5p_goni_defconfig | 2 | ||||
| -rw-r--r-- | configs/smdkc100_defconfig | 2 | ||||
| -rw-r--r-- | configs/smdkv310_defconfig | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index c0c3509..618e590 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -1,2 +1,4 @@ CONFIG_ARM=y +CONFIG_ARCH_S5PC1XX=y CONFIG_TARGET_S5P_GONI=y +CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni" diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig index 7455235..041030f 100644 --- a/configs/smdkc100_defconfig +++ b/configs/smdkc100_defconfig @@ -1,2 +1,4 @@ CONFIG_ARM=y CONFIG_TARGET_SMDKC100=y +CONFIG_ARCH_S5PC1XX=y +CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100" diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig index 44da273..0d1a24f 100644 --- a/configs/smdkv310_defconfig +++ b/configs/smdkv310_defconfig @@ -2,3 +2,4 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_SMDKV310=y +CONFIG_DEFAULT_DEVICE_TREE="exynos4210-smdkv310" |