summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-13 09:41:45 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-13 09:41:45 +0100
commitcb93e0a282abfdb4b6a287f2ac6aba14f61b4215 (patch)
treeaadbe6b600069e4f23bd7dbd4d54d9d4a4d071e2 /target
parent6fb9c8394e33a38bd0e0092c9dbf9b286ed42472 (diff)
parent607c3fcd1d10a37c077c870df450b5389fb519bf (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in3
-rw-r--r--target/linux/config/Config.in.audio5
-rw-r--r--target/linux/config/Config.in.netdevice11
-rw-r--r--target/linux/config/Config.in.usb48
-rw-r--r--target/linux/kernel.config1
-rw-r--r--target/mips/Makefile2
-rw-r--r--target/mips/kernel/lemote-yeelong27
-rw-r--r--target/mips/sys-available/lemote-yeelong3
-rw-r--r--target/sparc64/Makefile3
9 files changed, 59 insertions, 44 deletions
diff --git a/target/config/Config.in b/target/config/Config.in
index c50fbd289..3de5e3a23 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -213,6 +213,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I
default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI
default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+ default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
config ADK_QEMU_ARGS
string
@@ -612,7 +613,7 @@ config ADK_TARGET_CFLAGS
config ADK_TARGET_CMDLINE
string
default "dwc_otg.fiq_split_enable=1" if ADK_TARGET_SYSTEM_RASPBERRY_PI
- default "console=tty no_auto_cmd" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+ default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default "console=ttymxc0,115200" if ADK_TARGET_SYSTEM_CUBOX_I
default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100
default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index c466bed45..8a4198aee 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -4,6 +4,9 @@ depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND
config ADK_KERNEL_SND_ARM
boolean
+config ADK_KERNEL_SND_PCI
+ boolean
+
config ADK_KERNEL_SND_USB
boolean
@@ -36,7 +39,6 @@ config ADK_KPACKAGE_KMOD_SND_RAWMIDI
config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
tristate
- depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_SOUND
config ADK_KPACKAGE_KMOD_SND
prompt "kmod-snd...................... ALSA sound support"
@@ -93,6 +95,7 @@ config ADK_KPACKAGE_KMOD_SND_ENS1370
config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
prompt "kmod-snd-cs5535audio.......... ALSA AMD CS5535 driver"
tristate
+ select ADK_KERNEL_SND_PCI
select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
select ADK_KPACKAGE_KMOD_SND
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 789b75b7d..7aabc0b7e 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -68,17 +68,6 @@ config ADK_KERNEL_NATSEMI
default n
help
-config ADK_KERNEL_8139TOO
- boolean
- select ADK_KERNEL_NETDEVICES
- select ADK_KERNEL_NET_ETHERNET
- select ADK_KERNEL_NET_PCI
- select ADK_KERNEL_MII
- default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- default n
- help
-
-
config ADK_KERNEL_VIA_RHINE
boolean
select ADK_KERNEL_NETDEVICES
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index f6fd22339..2d50e24b2 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -5,20 +5,23 @@ config ADK_KERNEL_USB_SUPPORT
boolean
config ADK_KERNEL_USB
+ boolean
select ADK_KERNEL_USB_SUPPORT
default y if ADK_TARGET_SYSTEM_QEMU_SH4
default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
- boolean
+ default n
config ADK_KERNEL_USB_OHCI_HCD
+ boolean
default y if ADK_TARGET_SYSTEM_QEMU_SH4
default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
- boolean
+ default n
config ADK_KERNEL_USB_OHCI_HCD_PLATFORM
+ boolean
default y if ADK_TARGET_SYSTEM_QEMU_SH4
default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
- boolean
+ default n
config ADK_KERNEL_USB_LIBUSUAL
tristate
@@ -47,8 +50,6 @@ config ADK_KPACKAGE_KMOD_USB
select ADK_KERNEL_NLS
select ADK_KERNEL_USB_SUPPORT
depends on !ADK_KERNEL_USB
- default y if ADK_TARGET_SYSTEM_QEMU_I686
- default y if ADK_TARGET_SYSTEM_QEMU_X86_64
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
@@ -111,15 +112,12 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
tristate
select ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on ADK_KPACKAGE_KMOD_USB
- #depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- default y if ADK_TARGET_SYSTEM_QEMU_SH4
- default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
default n
help
The Open Host Controller Interface (OHCI) is a standard for accessing
@@ -176,8 +174,6 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
depends on ADK_KPACKAGE_KMOD_USB
- default y if ADK_TARGET_SYSTEM_QEMU_I686
- default y if ADK_TARGET_SYSTEM_QEMU_X86_64
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
@@ -212,34 +208,34 @@ config ADK_PACKAGE_KMOD_USB_CONTROLLER
config ADK_KPACKAGE_KMOD_USB_ACM
prompt "kmod-usb-acm...................... Support for USB modems/isdn controllers"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_USB_PEGASUS
prompt "kmod-usb-pegasus.................. Support for USB Pegasus"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_USB_HSO
prompt "kmod-usb-hso...................... Support for USB HSO devices"
tristate
select ADK_KPACKAGE_KMOD_RFKILL
select ADK_KPACKAGE_KMOD_USB_STORAGE
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_USB_PRINTER
prompt "kmod-usb-printer.................. Support for USB printers"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_USB_SERIAL
prompt "kmod-usb-serial................... Support for USB-to-serial converters"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
help
Say Y here if you have a USB device that provides normal serial
ports, or acts like a serial device, and you want to connect it to
@@ -253,8 +249,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL
config ADK_KPACKAGE_KMOD_USB_SERIAL_BELKIN
prompt "kmod-usb-serial-belkin.......... Support for Belkin USB-to-serial converters"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+ default n
help
Say Y here if you want to use a Belkin USB Serial single port
adaptor (F5U103 is one of the model numbers) or the Peracom single
@@ -263,8 +259,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_BELKIN
config ADK_KPACKAGE_KMOD_USB_SERIAL_FTDI_SIO
prompt "kmod-usb-serial-ftdi............ Support for FTDI USB-to-serial converter"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+ default n
help
Say Y here if you want to use a FTDI SIO single port USB to serial
converter device. The implementation I have is called the USC-1000.
@@ -276,8 +272,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_FTDI_SIO
config ADK_KPACKAGE_KMOD_USB_SERIAL_MCT_U232
prompt "kmod-usb-serial-mct-u232........ Support for Magic Control Technology USB-to-Serial converters"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+ default n
help
Say Y here if you want to use a USB Serial single port adapter from
Magic Control Technology Corp. (U232 is one of the model numbers).
@@ -288,8 +284,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_MCT_U232
config ADK_KPACKAGE_KMOD_USB_SERIAL_PL2303
prompt "kmod-usb-serial-pl2303.......... Support for Prolific PL2303 USB-to-Serial converters"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+ default n
help
Say Y here if you want to use the PL2303 USB Serial single port
adapter from Prolific.
@@ -297,8 +293,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_PL2303
config ADK_KPACKAGE_KMOD_USB_SERIAL_VISOR
prompt "kmod-usb-serial-visor........... Support for Handspring Visor / Palm m50x / Sony Clie Driver"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+ default n
help
Say Y here if you want to connect to your HandSpring Visor, Palm
m500 or m505 through its USB docking station. See
@@ -308,43 +304,43 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_VISOR
config ADK_KPACKAGE_KMOD_USB_STORAGE
prompt "kmod-usb-storage.................. Support for USB storage devices"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on !ADK_KERNEL_USB_STORAGE
select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI
select ADK_KPACKAGE_KMOD_BLK_DEV_SD if !ADK_KERNEL_SCSI
+ default n
config ADK_KPACKAGE_KMOD_USB_ATM
prompt "kmod-usb-atm...................... Support for USB ATM devices"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_USB_ATM_SPEEDTOUCH
prompt "kmod-usb-atm-speedtouch......... Support for USB Speedtouch ADSL modem"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_USB_ATM
+ default n
config ADK_KPACKAGE_KMOD_USB_USBNET
prompt "kmod-usb-usbnet................... Multi-purpose USB Networking Framework"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_SND_USB_AUDIO
prompt "kmod-snd-usb-audio................ USB sound adapter"
tristate
- default n
select ADK_KERNEL_SND_USB
select ADK_KPACKAGE_KMOD_SND
select ADK_KPACKAGE_KMOD_SND_RAWMIDI
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_USB_SISUSBVGA
prompt "kmod-usb-svga..................... USB 2.0 SVGA dongle support (Net2280/SiS315)"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
endmenu
diff --git a/target/linux/kernel.config b/target/linux/kernel.config
index de1324aa1..d69b28908 100644
--- a/target/linux/kernel.config
+++ b/target/linux/kernel.config
@@ -24,6 +24,7 @@ CONFIG_EMBEDDED=y
CONFIG_MODULES=y
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_SCRIPT=y
+CONFIG_HOTPLUG=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_STANDALONE=y
diff --git a/target/mips/Makefile b/target/mips/Makefile
index ae51eaa8e..68c2ea0fe 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -137,7 +137,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
@echo "Startup the netbook and type del to enter PMON:"
@echo "PMON> load /dev/fs/ext2@usb0/boot/kernel"
- @echo "PMON> g root=/dev/sdc1"
+ @echo "PMON> g"
endif
endif
ifeq ($(ADK_TARGET_FS),cf)
diff --git a/target/mips/kernel/lemote-yeelong b/target/mips/kernel/lemote-yeelong
new file mode 100644
index 000000000..c37d40271
--- /dev/null
+++ b/target/mips/kernel/lemote-yeelong
@@ -0,0 +1,27 @@
+CONFIG_MIPS=y
+CONFIG_MACH_LOONGSON=y
+CONFIG_LEMOTE_MACH2F=y
+CONFIG_CS5536=y
+CONFIG_CPU_LOONGSON2F=y
+CONFIG_CPU_NOP_WORKAROUNDS=y
+CONFIG_CPU_JUMP_WORKAROUNDS=y
+CONFIG_CPU_LOONGSON2F_WORKAROUNDS=y
+CONFIG_64BIT=y
+CONFIG_PAGE_SIZE_16KB=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_MIPS32_COMPAT=y
+CONFIG_COMPAT=y
+CONFIG_MIPS32_O32=y
+CONFIG_MIPS32_N32=y
+CONFIG_BLK_DEV=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139TOO=y
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO_LIBPS2=y
+
diff --git a/target/mips/sys-available/lemote-yeelong b/target/mips/sys-available/lemote-yeelong
index 10db77945..62eeb88ee 100644
--- a/target/mips/sys-available/lemote-yeelong
+++ b/target/mips/sys-available/lemote-yeelong
@@ -5,8 +5,6 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
select ADK_lemote_yeelong
select ADK_LINUX_64
select ADK_CPU_LOONGSON2F
- select ADK_KERNEL_MACH_LOONGSON
- select ADK_KERNEL_LEMOTE_MACH2F
select ADK_TARGET_WITH_USB_BOOT
select ADK_TARGET_WITH_USB
select ADK_TARGET_WITH_VGA
@@ -15,6 +13,7 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
select ADK_TARGET_WITH_HDD
select ADK_TARGET_WITH_PCI
select ADK_TARGET_KERNEL_VMLINUZ
+ select ADK_USE_KERNEL_MINICONFIG
help
System profile for Lemote Yeelong laptop.
diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile
index 12900ec8c..8fe5ebbcc 100644
--- a/target/sparc64/Makefile
+++ b/target/sparc64/Makefile
@@ -19,8 +19,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y)
@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@echo "Start qemu with following command line:"
ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
- @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 \
- -net nic,model=virtio -net user'
+ @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user'
else
@echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
endif