diff options
author | Graeme Gregory <dp@xora.org.uk> | 2009-05-23 21:48:59 +0100 |
---|---|---|
committer | Graeme Gregory <dp@xora.org.uk> | 2009-05-23 21:48:59 +0100 |
commit | 22069bb987b0076b6cae30d8f93153ef91a91657 (patch) | |
tree | b402cfdcd2e2119b496887bbf9dccb9a36da10d4 /conf/machine/at91sam9g20ek.conf | |
parent | b1b585492dac308d35bc3b6fb76d91a1a51d6561 (diff) | |
parent | 17ed48f1a44001d05614a03c0fc469346516f5a1 (diff) |
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine/at91sam9g20ek.conf')
-rw-r--r-- | conf/machine/at91sam9g20ek.conf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf index 903e953b13..38078b6d03 100644 --- a/conf/machine/at91sam9g20ek.conf +++ b/conf/machine/at91sam9g20ek.conf @@ -18,8 +18,7 @@ PREFERRED_VERSION_at91bootstrap = "2.10" USE_VT = "0" MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" -#EXTRA_IMAGEDEPENDS += "u-boot" -#EXTRA_IMAGEDEPENDS += "at91bootstrap" +EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" |