diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-05-05 10:09:06 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-05-05 10:09:06 +0200 |
| commit | b939689c7b87773c44275a578ffc8674a867e39d (patch) | |
| tree | 785d71eb0bbc707385e4456a14b21706223d99a3 /configs/integratorcp_cm926ejs_defconfig | |
| parent | 97840b5d1fe0960134c3553a9d9d1c1cd1be784d (diff) | |
| parent | ace97d26176a3ebc9ec07738450de93eea35975c (diff) | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'configs/integratorcp_cm926ejs_defconfig')
| -rw-r--r-- | configs/integratorcp_cm926ejs_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configs/integratorcp_cm926ejs_defconfig b/configs/integratorcp_cm926ejs_defconfig index a8d762b004..32ea7b97e7 100644 --- a/configs/integratorcp_cm926ejs_defconfig +++ b/configs/integratorcp_cm926ejs_defconfig @@ -1,3 +1,4 @@ -CONFIG_SYS_EXTRA_OPTIONS="CM924EJ_S" CONFIG_ARM=y -CONFIG_TARGET_INTEGRATORCP_CM926EJS=y +CONFIG_ARCH_INTEGRATOR=y +CONFIG_ARCH_INTEGRATOR_CP=y +CONFIG_CM926EJ_S=y |