Author: nbd Date: 2015-03-16 08:05:30 +0100 (Mon, 16 Mar 2015) New Revision: 44809
Added: trunk/target/linux/x86/geode/ trunk/target/linux/x86/geode/config-default trunk/target/linux/x86/geode/target.mk Removed: trunk/target/linux/x86/alix2/ trunk/target/linux/x86/generic/profiles/Soekris45xx.mk trunk/target/linux/x86/generic/profiles/Soekris48xx.mk trunk/target/linux/x86/generic/profiles/Wrap.mk trunk/target/linux/x86/geos/ trunk/target/linux/x86/net5501/ trunk/target/linux/x86/thincan/ Modified: trunk/target/linux/x86/Makefile trunk/target/linux/x86/config-3.18 trunk/target/linux/x86/modules.mk Log: x86: merge all geode based subtargets into one Build all geode platform drivers into the kernel Remove kmod-* packages for these drivers Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/target/linux/x86/Makefile =================================================================== --- trunk/target/linux/x86/Makefile 2015-03-16 07:04:28 UTC (rev 44808) +++ trunk/target/linux/x86/Makefile 2015-03-16 07:05:30 UTC (rev 44809) @@ -10,8 +10,7 @@ BOARD:=x86 BOARDNAME:=x86 FEATURES:=squashfs ext4 vdi vmdk pcmcia targz -SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos alix2 thincan \ - rdc +SUBTARGETS=generic olpc xen_domu ep80579 geode kvm_guest rdc KERNEL_PATCHVER:=3.18 Modified: trunk/target/linux/x86/config-3.18 =================================================================== --- trunk/target/linux/x86/config-3.18 2015-03-16 07:04:28 UTC (rev 44808) +++ trunk/target/linux/x86/config-3.18 2015-03-16 07:05:30 UTC (rev 44809) @@ -404,7 +404,7 @@ CONFIG_X86_MCE_THRESHOLD=y CONFIG_X86_MINIMUM_CPU_FAMILY=4 CONFIG_X86_MPPARSE=y -# CONFIG_X86_MSR is not set +CONFIG_X86_MSR=y # CONFIG_X86_P4_CLOCKMOD is not set # CONFIG_X86_PAE is not set CONFIG_X86_PAT=y Deleted: trunk/target/linux/x86/generic/profiles/Soekris45xx.mk =================================================================== --- trunk/target/linux/x86/generic/profiles/Soekris45xx.mk 2015-03-16 07:04:28 UTC (rev 44808) +++ trunk/target/linux/x86/generic/profiles/Soekris45xx.mk 2015-03-16 07:05:30 UTC (rev 44809) @@ -1,16 +0,0 @@ -# -# Copyright (C) 2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Soekris45xx - NAME:=Soekris Net45xx - PACKAGES:=kmod-natsemi kmod-leds-net48xx kmod-wdt-sc520 -endef - -define Profile/Soekris45xx/Description - Package set compatible with the Soekris Net45xx. Net4511 and 4521 need PCMCIA Cardbus support. Please add manually. -endef -$(eval $(call Profile,Soekris45xx)) Deleted: trunk/target/linux/x86/generic/profiles/Soekris48xx.mk =================================================================== --- trunk/target/linux/x86/generic/profiles/Soekris48xx.mk 2015-03-16 07:04:28 UTC (rev 44808) +++ trunk/target/linux/x86/generic/profiles/Soekris48xx.mk 2015-03-16 07:05:30 UTC (rev 44809) @@ -1,16 +0,0 @@ -# -# Copyright (C) 2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Soekris48xx - NAME:=Soekris Net48xx - PACKAGES:=kmod-i2c-scx200 kmod-natsemi kmod-leds-net48xx kmod-gpio-scx200 kmod-wdt-scx200 kmod-hwmon-pc87360 -endef - -define Profile/Soekris48xx/Description - Package set compatible with the Soekris Net4801. Contains I2C/LEDS/GPIO/Sensors support -endef -$(eval $(call Profile,Soekris48xx)) Deleted: trunk/target/linux/x86/generic/profiles/Wrap.mk =================================================================== --- trunk/target/linux/x86/generic/profiles/Wrap.mk 2015-03-16 07:04:28 UTC (rev 44808) +++ trunk/target/linux/x86/generic/profiles/Wrap.mk 2015-03-16 07:05:30 UTC (rev 44809) @@ -1,16 +0,0 @@ -# -# Copyright (C) 2006,2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/Wrap - NAME:=PCEngines WRAP - PACKAGES:=kmod-i2c-scx200 kmod-natsemi kmod-leds-wrap kmod-gpio-scx200 kmod-wdt-scx200 kmod-hwmon-pc87360 -endef - -define Profile/Wrap/Description - Package set compatible with the PCEngines WRAP. Contains I2C/LEDS/GPIO/Sensors support -endef -$(eval $(call Profile,Wrap)) Added: trunk/target/linux/x86/geode/config-default =================================================================== --- trunk/target/linux/x86/geode/config-default (rev 0) +++ trunk/target/linux/x86/geode/config-default 2015-03-16 07:05:30 UTC (rev 44809) @@ -0,0 +1,58 @@ +CONFIG_ALIX=y +# CONFIG_ATA_PIIX is not set +CONFIG_CS5535_CLOCK_EVENT_SRC=y +CONFIG_CS5535_MFGPT=y +CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7 +CONFIG_GEODE_WDT=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_CS5535=y +CONFIG_GPIO_DEVRES=y +# CONFIG_GPIO_F7188X is not set +# CONFIG_GPIO_INTEL_MID is not set +CONFIG_GPIO_SYSFS=y +# CONFIG_HIGHMEM64G is not set +CONFIG_HWMON=y +CONFIG_I2C=y +CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_ALGOPCA=y +CONFIG_I2C_ALGOPCF=y +CONFIG_I2C_BOARDINFO=y +# CONFIG_KEYBOARD_GPIO is not set +CONFIG_LEDS_GPIO=y +# CONFIG_M486 is not set +CONFIG_MFD_CORE=y +CONFIG_MFD_CS5535=y +CONFIG_MGEODE_LX=y +CONFIG_NATSEMI=y +CONFIG_NET5501=y +CONFIG_NLS=y +CONFIG_NSC_GPIO=y +CONFIG_PATA_CS5520=y +CONFIG_PATA_CS5530=y +CONFIG_PATA_CS5535=y +CONFIG_PATA_CS5536=y +CONFIG_PATA_SC1200=y +CONFIG_PC8736x_GPIO=y +CONFIG_SC1200_WDT=y +CONFIG_SCx200_ACB=y +CONFIG_SCx200_WDT=y +CONFIG_SENSORS_LM90=y +CONFIG_USB=y +CONFIG_USB_COMMON=y +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_HCD_PLATFORM is not set +CONFIG_USB_EHCI_PCI=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PCI=y +# CONFIG_USB_OHCI_HCD_PLATFORM is not set +# CONFIG_USB_UHCI_HCD is not set +CONFIG_VIA_RHINE=y +CONFIG_VIA_RHINE_MMIO=y +CONFIG_X86_CMOV=y +CONFIG_X86_CPUID=y +CONFIG_X86_DEBUGCTLMSR=y +# CONFIG_X86_MCE is not set +CONFIG_X86_REBOOTFIXUPS=y +CONFIG_X86_TSC=y +CONFIG_X86_USE_3DNOW=y +CONFIG_X86_USE_PPRO_CHECKSUM=y Added: trunk/target/linux/x86/geode/target.mk =================================================================== --- trunk/target/linux/x86/geode/target.mk (rev 0) +++ trunk/target/linux/x86/geode/target.mk 2015-03-16 07:05:30 UTC (rev 44809) @@ -0,0 +1,14 @@ +BOARDNAME:=AMD Geode based systems +FEATURES:=squashfs ext4 pci usb gpio +DEFAULT_PACKAGES += \ + kmod-crypto-hw-geode kmod-crypto-ocf kmod-crypto-aes kmod-crypto-cbc \ + kmod-ath5k kmod-ath9k \ + kmod-button-hotplug \ + kmod-ledtrig-heartbeat kmod-ledtrig-gpio \ + kmod-ledtrig-netdev hwclock wpad-mini + +CPU_TYPE := geode + +define Target/Description + Build firmware images for AMD Geode GX/LX based systems (net5501, alix, geos) +endef Modified: trunk/target/linux/x86/modules.mk =================================================================== --- trunk/target/linux/x86/modules.mk 2015-03-16 07:04:28 UTC (rev 44808) +++ trunk/target/linux/x86/modules.mk 2015-03-16 07:05:30 UTC (rev 44809) @@ -5,314 +5,6 @@ # See /LICENSE for more information. # -define KernelPackage/cs5535 - SUBMENU:=$(BLOCK_MENU) - TITLE:=NSC/AMD CS5535 chipset support - DEPENDS:=@TARGET_x86 - KCONFIG:=CONFIG_BLK_DEV_CS5535 - FILES=$(LINUX_DIR)/drivers/ide/cs5535.ko - AUTOLOAD:=$(call AutoLoad,30,cs5535,1) - $(call AddDepends/ide) -endef - -define KernelPackage/cs5535/description - Kernel module for the NSC/AMD CS5535 companion chip -endef - -$(eval $(call KernelPackage,cs5535)) - - -define KernelPackage/cs5536 - SUBMENU:=$(BLOCK_MENU) - TITLE:=AMD CS5536 chipset support - DEPENDS:=@TARGET_x86 - KCONFIG:=CONFIG_BLK_DEV_CS5536 - FILES=$(LINUX_DIR)/drivers/ide/cs5536.ko - AUTOLOAD:=$(call AutoLoad,30,cs5536,1) - $(call AddDepends/ide) -endef - -define KernelPackage/cs5536/description - Kernel module for the AMD CS5536 Geode LX companion chip -endef - -$(eval $(call KernelPackage,cs5536)) - - -define KernelPackage/pata-cs5535 - SUBMENU:=$(BLOCK_MENU) - TITLE:=CS5535 PATA support - DEPENDS:=@TARGET_x86 @PCI_SUPPORT - KCONFIG:=CONFIG_PATA_CS5535 - FILES=$(LINUX_DIR)/drivers/ata/pata_cs5535.ko - AUTOLOAD:=$(call AutoLoad,30,pata_cs5535,1) - $(call AddDepends/ata) -endef - -define KernelPackage/pata-cs5535/description - Kernel module for the NSC/AMD CS5535 companion chip -endef - -$(eval $(call KernelPackage,pata-cs5535)) - - -define KernelPackage/pata-cs5536 - SUBMENU:=$(BLOCK_MENU) - TITLE:=CS5536 PATA support - DEPENDS:=@TARGET_x86 @PCI_SUPPORT - KCONFIG:=CONFIG_PATA_CS5536 - FILES=$(LINUX_DIR)/drivers/ata/pata_cs5536.ko - AUTOLOAD:=$(call AutoLoad,30,pata_cs5536,1) - $(call AddDepends/ata) -endef - -define KernelPackage/pata-cs5536/description - Kernel module for the AMD CS5536 Geode LX companion chip -endef - -$(eval $(call KernelPackage,pata-cs5536)) - - -define KernelPackage/cpu-msr - SUBMENU:=$(OTHER_MENU) - TITLE:=x86 CPU MSR support - DEPENDS:=@TARGET_x86 - KCONFIG:=CONFIG_X86_MSR - FILES:=$(LINUX_DIR)/arch/x86/kernel/msr.ko - AUTOLOAD:=$(call AutoLoad,20,msr) -endef - -define KernelPackage/cpu-msr/description - Kernel module for Model Specific Registers support in x86 CPUs -endef - -$(eval $(call KernelPackage,cpu-msr)) - -define KernelPackage/gpio-cs5535-new - SUBMENU:=$(OTHER_MENU) - TITLE:=AMD CS5535/CS5536 GPIO driver with improved sysfs support - DEPENDS:=@TARGET_x86 +kmod-cs5535-mfd - KCONFIG:=CONFIG_GPIO_CS5535 - FILES:=$(LINUX_DIR)/drivers/gpio/gpio-cs5535.ko - AUTOLOAD:=$(call AutoLoad,50,gpio-cs5535) -endef - -define KernelPackage/gpio-cs5535-new/description - This package contains the new AMD CS5535/CS5536 GPIO driver -endef - -$(eval $(call KernelPackage,gpio-cs5535-new)) - -define KernelPackage/gpio-nsc - SUBMENU:=$(OTHER_MENU) - TITLE:=Natsemi GPIO support - DEPENDS:=@TARGET_x86 - KCONFIG:=CONFIG_NSC_GPIO - FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.ko - AUTOLOAD:=$(call AutoLoad,40,nsc_gpio) -endef - -define KernelPackage/gpio-nsc/description - Kernel module for Natsemi GPIO -endef - -$(eval $(call KernelPackage,gpio-nsc)) - - -define KernelPackage/gpio-pc8736x - SUBMENU:=$(OTHER_MENU) - TITLE:=PC8736x GPIO support - DEPENDS:=@TARGET_x86 +kmod-gpio-nsc - KCONFIG:=CONFIG_PC8736x_GPIO - FILES:=$(LINUX_DIR)/drivers/char/pc8736x_gpio.ko - AUTOLOAD:=$(call AutoLoad,40,pc8736x_gpio) -endef - -define KernelPackage/gpio-pc8736x/description - Kernel module for PC8736x GPIO -endef - -$(eval $(call KernelPackage,gpio-pc8736x)) - - -define KernelPackage/gpio-scx200 - SUBMENU:=$(OTHER_MENU) - TITLE:=Natsemi SCX200 GPIO support - DEPENDS:=@TARGET_x86 +kmod-gpio-nsc - KCONFIG:=CONFIG_SCx200_GPIO - FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.ko - AUTOLOAD:=$(call AutoLoad,50,scx200_gpio) -endef - -define KernelPackage/gpio-scx200/description - Kernel module for SCX200 GPIO -endef - -$(eval $(call KernelPackage,gpio-scx200)) - -define KernelPackage/wdt-geode - SUBMENU:=$(OTHER_MENU) - TITLE:=Geode/LX Watchdog timer - DEPENDS:=@TARGET_x86 +kmod-cs5535-mfgpt - KCONFIG:=CONFIG_GEODE_WDT - FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/geodewdt.ko - AUTOLOAD:=$(call AutoLoad,50,geodewdt) -endef - -define KernelPackage/wdt-geode/description - Kernel module for Geode watchdog timer. -endef - -$(eval $(call KernelPackage,wdt-geode)) - - -define KernelPackage/cs5535-clockevt - SUBMENU:=$(OTHER_MENU) - TITLE:=CS5535/CS5536 high-res timer (MFGPT) events - DEPENDS:=@TARGET_x86 +kmod-cs5535-mfgpt - KCONFIG:=CONFIG_CS5535_CLOCK_EVENT_SRC - FILES:=$(LINUX_DIR)/drivers/clocksource/cs5535-clockevt.ko - AUTOLOAD:=$(call AutoLoad,50,cs5535-clockevt) -endef - -define KernelPackage/cs5535-clockevt/description - Kernel module for CS5535/6 high-res clock event source -endef - -$(eval $(call KernelPackage,cs5535-clockevt)) - - -define KernelPackage/cs5535-mfgpt - SUBMENU:=$(OTHER_MENU) - TITLE:=CS5535/6 Multifunction General Purpose Timer - DEPENDS:=@TARGET_x86 +kmod-cs5535-mfd - KCONFIG:=CONFIG_CS5535_MFGPT - FILES:=$(LINUX_DIR)/drivers/misc/cs5535-mfgpt.ko - AUTOLOAD:=$(call AutoLoad,45,cs5535-mfgpt) -endef - -define KernelPackage/cs5535-mfgpt/description - Kernel module for CS5535/6 multifunction general purpose timer. -endef - -$(eval $(call KernelPackage,cs5535-mfgpt)) - - -define KernelPackage/cs5535-mfd - SUBMENU:=$(OTHER_MENU) - TITLE:=CS5535/6 Multifunction General Purpose Driver - DEPENDS:=@TARGET_x86 - KCONFIG:=CONFIG_MFD_CS5535 - FILES:= \ - $(LINUX_DIR)/drivers/mfd/mfd-core.ko \ - $(LINUX_DIR)/drivers/mfd/cs5535-mfd.ko - AUTOLOAD:=$(call AutoLoad,44,mfd-core cs5535-mfd) -endef - -define KernelPackage/cs5535-mfd/description - Core driver for CS5535/CS5536 MFD functions. -endef - -$(eval $(call KernelPackage,cs5535-mfd)) - -define KernelPackage/wdt-sc520 - SUBMENU:=$(OTHER_MENU) - TITLE:=Natsemi SC520 Watchdog support - DEPENDS:=@TARGET_x86 - KCONFIG:=CONFIG_SC520_WDT - FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/sc520_wdt.ko - AUTOLOAD:=$(call AutoLoad,50,sc520_wdt) -endef - -define KernelPackage/wdt-sc520/description - Kernel module for SC520 Watchdog -endef - -$(eval $(call KernelPackage,wdt-sc520)) - - -define KernelPackage/wdt-scx200 - SUBMENU:=$(OTHER_MENU) - TITLE:=Natsemi SCX200 Watchdog support - DEPENDS:=@TARGET_x86 - KCONFIG:=CONFIG_SCx200_WDT - FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/scx200_wdt.ko - AUTOLOAD:=$(call AutoLoad,50,scx200_wdt) -endef - -define KernelPackage/wdt-scx200/description - Kernel module for SCX200 Watchdog -endef - -$(eval $(call KernelPackage,wdt-scx200)) - -I2C_SCX200_MODULES:=\ - CONFIG_SCx200_I2C:drivers/i2c/busses/scx200_i2c - -define KernelPackage/i2c-scx200 - $(call i2c_defaults,$(I2C_SCX200_MODULES),59) - TITLE:=Geode SCx200 I2C using GPIO pins - DEPENDS:=@PCI_SUPPORT @TARGET_x86 +kmod-i2c-algo-bit - KCONFIG+= \ - CONFIG_SCx200_I2C_SCL=12 \ - CONFIG_SCx200_I2C_SDA=13 -endef - -define KernelPackage/i2c-scx200/description - Kernel module for I2C using GPIO pins on the Geode SCx200 processors. -endef - -$(eval $(call KernelPackage,i2c-scx200)) - - -I2C_SCX200_ACB_MODULES:=\ - CONFIG_SCx200_ACB:drivers/i2c/busses/scx200_acb - -define KernelPackage/i2c-scx200-acb - $(call i2c_defaults,$(I2C_SCX200_ACB_MODULES),59) - TITLE:=Geode SCx200 ACCESS.bus support - DEPENDS:=@PCI_SUPPORT @TARGET_x86 +kmod-i2c-algo-bit -endef - -define KernelPackage/i2c-scx200-acb/description - Kernel module for I2C using the ACCESS.bus controllers on the Geode SCx200 - and SC1100 processors and the CS5535 and CS5536 Geode companion devices. -endef - -$(eval $(call KernelPackage,i2c-scx200-acb)) - - -define KernelPackage/leds-wrap - SUBMENU:=$(LEDS_MENU) - TITLE:=PCengines WRAP LED support - DEPENDS:=@TARGET_x86 +kmod-gpio-scx200 - KCONFIG:=CONFIG_LEDS_WRAP - FILES:=$(LINUX_DIR)/drivers/leds/leds-wrap.ko - AUTOLOAD:=$(call AutoLoad,50,leds-wrap) -endef - -define KernelPackage/leds-wrap/description - Kernel module for PCengines WRAP LEDs -endef - -$(eval $(call KernelPackage,leds-wrap)) - - -define KernelPackage/leds-net48xx - SUBMENU:=$(LEDS_MENU) - TITLE:=Soekris Net48xx LED support - DEPENDS:=@TARGET_x86 +kmod-gpio-scx200 - KCONFIG:=CONFIG_LEDS_NET48XX - FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.ko - AUTOLOAD:=$(call AutoLoad,50,leds-net48xx) -endef - -define KernelPackage/leds-net48xx/description - Kernel module for Soekris Net48xx LEDs -endef - -$(eval $(call KernelPackage,leds-net48xx)) - define KernelPackage/rdc321x-wdt SUBMENU:=$(OTHER_MENU) TITLE:=RDC321x watchdog _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
