diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/Config.in | 3 | ||||
| -rw-r--r-- | target/Makefile | 2 | ||||
| -rw-r--r-- | target/alix2d/Makefile | 18 | ||||
| -rw-r--r-- | target/alix2d/kernel.config | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.usb | 6 |
5 files changed, 17 insertions, 14 deletions
diff --git a/target/Config.in b/target/Config.in index 861e2d6b7..98e9f179a 100644 --- a/target/Config.in +++ b/target/Config.in @@ -636,7 +636,6 @@ depends on ADK_LINUX_ALIX config ADK_LINUX_X86_ALIX1C bool "PC Engines Alix1C" select ADK_alix1c - select ADK_KERNEL_USB select ADK_KERNEL_NLS select ADK_KERNEL_SCSI select ADK_KERNEL_ATA @@ -660,7 +659,6 @@ config ADK_LINUX_X86_ALIX1C config ADK_LINUX_X86_ALIX2D bool "PC Engines Alix2D" select ADK_alix2d - select ADK_KERNEL_USB select ADK_KERNEL_NLS select ADK_KERNEL_SCSI select ADK_KERNEL_ATA @@ -684,7 +682,6 @@ config ADK_LINUX_X86_ALIX2D config ADK_LINUX_X86_ALIX2D13 bool "PC Engines Alix2D13" select ADK_alix2d13 - select ADK_KERNEL_USB select ADK_KERNEL_NLS select ADK_KERNEL_SCSI select ADK_KERNEL_ATA diff --git a/target/Makefile b/target/Makefile index 6d249ce29..5e7259d8a 100644 --- a/target/Makefile +++ b/target/Makefile @@ -89,4 +89,4 @@ clean: $(ADK_TARGET)-clean $(ADK_TARGET)-imageclean %-imageinstall: %-imageprepare $(TRACE) target/$(patsubst %-imageinstall,%,$@)-imageinstall $(MAKE) -C $(patsubst %-imageinstall,%,$@) imageinstall - @echo 'Login as user root with password linux123 via ssh or console' + @echo 'Login as user root with password ${ADK_RUNTIME_PASSWORD} via ssh or console' diff --git a/target/alix2d/Makefile b/target/alix2d/Makefile index bed5b3c69..bdd90a52c 100644 --- a/target/alix2d/Makefile +++ b/target/alix2d/Makefile @@ -11,23 +11,29 @@ KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage ifeq ($(FS),ext2-block) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is:" + @echo "$(BIN_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to CompactFlash use scripts/install.sh" endif ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' - @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSUSERTARBALL}' + @echo 'The linux kernel is here:' + @echo '$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' + @echo 'The nfs root tarball is here:' + @echo '${BIN_DIR}/${ROOTFSUSERTARBALL}' endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' + @echo 'The kernel file is:' + @echo '${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' + @echo 'The initramfs image is:' + @echo '${BIN_DIR}/${INITRAMFS}' endif ifeq ($(FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs @cp $(KERNEL) ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel - @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' + @echo 'The kernel+initramfs file is:' + @echo '${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' endif diff --git a/target/alix2d/kernel.config b/target/alix2d/kernel.config index ed92ec97c..9169d8037 100644 --- a/target/alix2d/kernel.config +++ b/target/alix2d/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.34 -# Mon Jul 5 20:57:19 2010 +# Mon Jul 5 23:07:16 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index b3c48c9ea..3111b1692 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -28,7 +28,7 @@ config ADK_KERNEL_USB_UHCI_HCD config ADK_KPACKAGE_KMOD_USB prompt "kmod-usb-core..................... USB support" tristate - default y if ADK_LINUX_X86_ALIX1C + default y if ADK_LINUX_ALIX default y if ADK_LINUX_MIPS64_LEMOTE default n depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 || ADK_KERNEL_USB) @@ -81,7 +81,7 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD config ADK_KPACKAGE_KMOD_USB_OHCI_HCD prompt "kmod-usb-ohci................... Support for OHCI controllers" tristate - default y if ADK_LINUX_X86_ALIX1C + default y if ADK_LINUX_ALIX default y if ADK_LINUX_MIPS64_LEMOTE default n depends on !ADK_LINUX_CRIS_FOXBOARD @@ -128,7 +128,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD prompt "kmod-usb-ehci................... Support for USB 2.0 controllers" tristate depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_KERNEL_USB_EHCI_HCD) - default y if ADK_LINUX_X86_ALIX1C + default y if ADK_LINUX_ALIX default y if ADK_LINUX_MIPS64_LEMOTE default n depends on ADK_KPACKAGE_KMOD_USB |