diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-10 15:37:00 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-10 15:37:00 +0200 |
| commit | 57f50b48420342dbc5996896a52733c5fbab31b1 (patch) | |
| tree | 9939f505a3a706539cfcc432211cedd355ae3049 /target | |
| parent | cbce24b80358c0eb4968139c7695dd8eb2bb5378 (diff) | |
| parent | 91cef89d579c704c4846e97bce397c93417eee09 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/Makefile | 2 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 8 | ||||
| -rw-r--r-- | target/packages/pkg-available/console | 1 | ||||
| -rw-r--r-- | target/packages/pkg-available/mpdbox | 3 | ||||
| -rw-r--r-- | target/x86/kernel/generic-pc | 4 |
5 files changed, 17 insertions, 1 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 13f6ea62b..f781bdd27 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -59,7 +59,7 @@ endif @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) @echo "Use following command to install it on SD card:" - @echo "sudo ./scripts/install-rpi.sh /dev/sdb $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "sudo ./scripts/install-rpi.sh /dev/sdx $(FW_DIR)/$(ROOTFSTARBALL)" endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 776a1a6f9..ea023d0df 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -7,6 +7,14 @@ config ADK_RUNTIME_HOSTNAME help Set your target hostname. +config ADK_RUNTIME_START_SERVICES + prompt "start some services by default" + boolean + default n + help + +source "target/config/Config.in.scripts" + config ADK_RUNTIME_SSH_PUBKEY string "SSH public key (root user only)" default "" diff --git a/target/packages/pkg-available/console b/target/packages/pkg-available/console index ef688a3af..68ff1f0b5 100644 --- a/target/packages/pkg-available/console +++ b/target/packages/pkg-available/console @@ -3,6 +3,7 @@ config ADK_PKG_CONSOLE default n select ADK_PACKAGE_ALSA_UTILS select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER + select ADK_PACKAGE_DROPBEAR select ADK_PACKAGE_SCREEN select ADK_PACKAGE_SUDO select ADK_PACKAGE_LINKS diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index b67197c11..31fd10381 100644 --- a/target/packages/pkg-available/mpdbox +++ b/target/packages/pkg-available/mpdbox @@ -2,6 +2,8 @@ config ADK_PKG_MPDBOX bool "Choose packages for MPDBox system" default n select ADK_PACKAGE_MPDBOX + select ADK_PACKAGE_DROPBEAR + select BUSYBOX_NTPD select ADK_PACKAGE_CIFS_UTILS select ADK_PACKAGE_NFS_UTILS select ADK_PACKAGE_NFS_UTILS_CLIENT @@ -55,6 +57,7 @@ config ADK_PKG_MPDBOX select ADK_KPACKAGE_KMOD_SND_INTEL8X0 if ADK_TARGET_SYSTEM_QEMU_I686 select ADK_KPACKAGE_KMOD_SND_USB_AUDIO select ADK_KPACKAGE_KMOD_USB_STORAGE + select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DAC if ADK_TARGET_SYSTEM_RASPBERRY_PI help Create a small mpdbox. diff --git a/target/x86/kernel/generic-pc b/target/x86/kernel/generic-pc index f665a27c6..8b26b4d30 100644 --- a/target/x86/kernel/generic-pc +++ b/target/x86/kernel/generic-pc @@ -17,3 +17,7 @@ CONFIG_E100=y CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_ATA=y +CONFIG_ATA_SFF=y +CONFIG_ATA_BMDMA=y +CONFIG_ATA_PIIX=y |