commit 6b5e8a5cd478cd441f53f217f8f52c7c848daed9 Author: p4u Date: Sun Oct 9 21:37:34 2011 +0200 Added targets.mk file to define targets (rspro, alix, etc...) and solved some issues with kerne_config feature diff --git a/Makefile b/Makefile index 5cc87b3..85d9e11 100644 --- a/Makefile +++ b/Makefile @@ -30,14 +30,17 @@ J ?= 1 V ?= 99 T = MAKE_SRC = make -j$(J) V=$(V) -TIMESTAMP = $(shell date +%d%m%y_%H%M) include targets.mk +TIMESTAMP = $(shell date +%d%m%y_%H%M) +CONFIG = $(BUILD_DIR)/$(T)/.config +KCONFIG = $(BUILD_DIR)/$(T)/target/linux/$(ARCH)/config-* + .PHONY: checkout update clean config menuconfig kernel_menuconfig list_targets build define build_src - cd $1/$2 && $(MAKE_SRC) + cd $(BUILD_DIR)/$(T) && $(MAKE_SRC) endef define checkout_src @@ -48,31 +51,32 @@ define checkout_src rm -rf $(BUILD_DIR)/$(T)/feeds/ cp -f $(BUILD_DIR)/qmp/feeds.conf $(BUILD_DIR)/$(T)/ sed -i -e "s|PATH|`pwd`/$(BUILD_DIR)|" $(BUILD_DIR)/$(T)/feeds.conf - cp -f $(CONFIG_DIR)/$(T)/config $(BUILD_DIR)/$(T)/.config + cp -f $(CONFIG_DIR)/$(T)/config $(CONFIG) + [ -f $(CONFIG_DIR)/$(T)/kernel_config ] && cp -f $(CONFIG_DIR)/$(T)/kernel_config $(KCONFIG) || true endef define update_feeds - @echo "Updateing feed $(1)" - ./$(BUILD_DIR)/$1/scripts/feeds update -a - ./$(BUILD_DIR)/$1/scripts/feeds install -a + @echo "Updateing feed $(T)" + #./$(BUILD_DIR)/$(T)/scripts/feeds update -a + #./$(BUILD_DIR)/$(T)/scripts/feeds install -a endef define menuconfig_owrt - cd $(BUILD_DIR)/$1 && make menuconfig - [ ! -d $(MY_CONFIGS)/$1 ] && mkdir -p $(MY_CONFIGS)/$1 || true - cp -f $(BUILD_DIR)/$1/.config $(MY_CONFIGS)/$1/config + cd $(BUILD_DIR)/$(T) && make menuconfig + [ ! -d $(MY_CONFIGS)/$(T) ] && mkdir -p $(MY_CONFIGS)/$(T) || true + cp -f $(CONFIG) $(MY_CONFIGS)/$(T)/config endef define kmenuconfig_owrt - cd $(BUILD_DIR)/$1 && make kernel_menuconfig - [ ! -d $(MY_CONFIGS)/$1 ] && mkdir -p $(MY_CONFIGS)/$1 || true - cp -f $(BUILD_DIR)/$1/target/linux/$(ARCH)/config-* $(MY_CONFIGS)/$1/kernel_config + cd $(BUILD_DIR)/$(T) && make kernel_menuconfig + [ ! -d $(MY_CONFIGS)/$(T) ] && mkdir -p $(MY_CONFIGS)/$(T) || true + cp -f $(KCONFIG) $(MY_CONFIGS)/$(T)/kernel_config endef define post_build [ ! -d $(IMAGES) ] && mkdir $(IMAGES) || true - cp -f $(BUILD_DIR)/$1/$(IMAGE) $(IMAGES)/$(NAME)-factory-$(TIMESTAMP).bin - cp -f $(BUILD_DIR)/$1/$(SYSUPGRADE) $(IMAGES)/$(NAME)-upgrade-$(TIMESTAMP).bin + cp -f $(BUILD_DIR)/$(T)/$(IMAGE) $(IMAGES)/$(NAME)-factory-$(TIMESTAMP).bin + cp -f $(BUILD_DIR)/$(T)/$(SYSUPGRADE) $(IMAGES)/$(NAME)-upgrade-$(TIMESTAMP).bin @echo @echo "qMp firmware compiled, you can find output files in $(IMAGES) directory" endef @@ -84,8 +88,8 @@ define clean_all endef define clean_target - [ -d "$(BUILD_DIR)/$1" ] && rm -rf $(BUILD_DIR)/$1 || true - rm -f .checkout_$1 2>/dev/null || true + [ -d "$(BUILD_DIR)/$(T)" ] && rm -rf $(BUILD_DIR)/$(T) || true + rm -f .checkout_$(T) 2>/dev/null || true endef define target_error @@ -106,7 +110,7 @@ endef checkout: .checkout_qmp .checkout_eig $(if $(T),,$(call target_error)) $(if $(wildcard .checkout_$(T)),,$(call checkout_src)) - $(if $(wildcard .checkout_$(T)),,$(call update_feeds,$(T))) + $(if $(wildcard .checkout_$(T)),,$(call update_feeds)) @touch .checkout_$(T) update: .checkout_eig .checkout_qmp @@ -116,13 +120,13 @@ update: .checkout_eig .checkout_qmp $(foreach dir,$(HW_AVAILABLE),$(if $(wildcard $(BUILD_DIR)/$(dir)),$(call update_feeds,$(dir)))) menuconfig: checkout - $(call menuconfig_owrt,$(T)) + $(call menuconfig_owrt) kernel_menuconfig: checkout - $(call kmenuconfig_owrt,$(T)) + $(call kmenuconfig_owrt) clean: - $(if $(T),$(call clean_target,$(T)),$(call clean_all)) + $(if $(T),$(call clean_target),$(call clean_all)) list_targets: $(info $(HW_AVAILABLE)) @@ -133,6 +137,6 @@ config: mv .config.tmp .config build: checkout - $(if $(T),$(call build_src,$(BUILD_DIR),$(T))) - $(call post_build,$(T)) + $(if $(T),$(call build_src)) + $(call post_build) diff --git a/configs/rspro/kernel_config b/configs/rspro/kernel_config new file mode 100644 index 0000000..ceb6ef0 --- /dev/null +++ b/configs/rspro/kernel_config @@ -0,0 +1,251 @@ +CONFIG_32BIT=y +# CONFIG_64BIT is not set +CONFIG_AG71XX=y +CONFIG_AG71XX_AR8216_SUPPORT=y +# CONFIG_AG71XX_DEBUG is not set +# CONFIG_AG71XX_DEBUG_FS is not set +# CONFIG_ALCHEMY_GPIO_INDIRECT is not set +# CONFIG_AR7 is not set +CONFIG_AR71XX_DEV_AP91_PCI=y +CONFIG_AR71XX_DEV_AP94_PCI=y +CONFIG_AR71XX_DEV_AR913X_WMAC=y +CONFIG_AR71XX_DEV_DSA=y +CONFIG_AR71XX_DEV_GPIO_BUTTONS=y +CONFIG_AR71XX_DEV_LEDS_GPIO=y +CONFIG_AR71XX_DEV_M25P80=y +CONFIG_AR71XX_DEV_PB42_PCI=y +CONFIG_AR71XX_DEV_PB9X_PCI=y +CONFIG_AR71XX_DEV_USB=y +CONFIG_AR71XX_MACH_AP81=y +CONFIG_AR71XX_MACH_AP83=y +CONFIG_AR71XX_MACH_AW_NR580=y +CONFIG_AR71XX_MACH_DIR_600_A1=y +CONFIG_AR71XX_MACH_DIR_615_C1=y +CONFIG_AR71XX_MACH_DIR_825_B1=y +CONFIG_AR71XX_MACH_MZK_W04NU=y +CONFIG_AR71XX_MACH_MZK_W300NH=y +CONFIG_AR71XX_MACH_PB42=y +CONFIG_AR71XX_MACH_PB44=y +CONFIG_AR71XX_MACH_PB92=y +CONFIG_AR71XX_MACH_RB4XX=y +CONFIG_AR71XX_MACH_RB750=y +CONFIG_AR71XX_MACH_TEW_632BRP=y +CONFIG_AR71XX_MACH_TL_WR1043ND=y +CONFIG_AR71XX_MACH_TL_WR741ND=y +CONFIG_AR71XX_MACH_TL_WR841N_V1=y +CONFIG_AR71XX_MACH_TL_WR941ND=y +CONFIG_AR71XX_MACH_UBNT=y +CONFIG_AR71XX_MACH_WNDR3700=y +CONFIG_AR71XX_MACH_WNR2000=y +CONFIG_AR71XX_MACH_WP543=y +CONFIG_AR71XX_MACH_WRT160NL=y +CONFIG_AR71XX_MACH_WRT400N=y +CONFIG_AR71XX_MACH_WZR_HP_G300NH=y +CONFIG_AR71XX_NVRAM=y +CONFIG_AR71XX_WDT=y +CONFIG_AR8216_PHY=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +CONFIG_ARCH_REQUIRE_GPIOLIB=y +# CONFIG_ARCH_SUPPORTS_MSI is not set +CONFIG_ARCH_SUPPORTS_OPROFILE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ATHEROS_AR71XX=y +# CONFIG_BCM47XX is not set +# CONFIG_BCM63XX is not set +CONFIG_BITREVERSE=y +# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set +# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_CEVT_R4K=y +CONFIG_CEVT_R4K_LIB=y +CONFIG_CFG80211_DEFAULT_PS_VALUE=0 +CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200" +CONFIG_CPU_BIG_ENDIAN=y +# CONFIG_CPU_CAVIUM_OCTEON is not set +CONFIG_CPU_HAS_PREFETCH=y +CONFIG_CPU_HAS_SYNC=y +# CONFIG_CPU_LITTLE_ENDIAN is not set +# CONFIG_CPU_LOONGSON2E is not set +CONFIG_CPU_MIPS32=y +# CONFIG_CPU_MIPS32_R1 is not set +CONFIG_CPU_MIPS32_R2=y +# CONFIG_CPU_MIPS64_R1 is not set +# CONFIG_CPU_MIPS64_R2 is not set +CONFIG_CPU_MIPSR2=y +# CONFIG_CPU_NEVADA is not set +# CONFIG_CPU_R10000 is not set +# CONFIG_CPU_R3000 is not set +# CONFIG_CPU_R4300 is not set +# CONFIG_CPU_R4X00 is not set +# CONFIG_CPU_R5000 is not set +# CONFIG_CPU_R5432 is not set +# CONFIG_CPU_R5500 is not set +# CONFIG_CPU_R6000 is not set +# CONFIG_CPU_R8000 is not set +# CONFIG_CPU_RM7000 is not set +# CONFIG_CPU_RM9000 is not set +# CONFIG_CPU_SB1 is not set +CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_HIGHMEM=y +# CONFIG_CPU_TX39XX is not set +# CONFIG_CPU_TX49XX is not set +# CONFIG_CPU_VR41XX is not set +CONFIG_CSRC_R4K=y +CONFIG_CSRC_R4K_LIB=y +CONFIG_DECOMPRESS_LZMA=y +CONFIG_DEVPORT=y +# CONFIG_DM9000 is not set +CONFIG_DMA_NEED_PCI_MAP_STATE=y +CONFIG_DMA_NONCOHERENT=y +CONFIG_DNOTIFY=y +CONFIG_EARLY_PRINTK=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_FIND_LAST_BIT=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_NXP_74HC153=y +CONFIG_GPIO_PCF857X=y +CONFIG_GPIO_SYSFS=y +CONFIG_HARDWARE_WATCHPOINTS=y +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_HAVE_IDE=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HW_HAS_PCI=y +# CONFIG_HW_RANDOM is not set +CONFIG_I2C=y +CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_GPIO=y +CONFIG_IMAGE_CMDLINE_HACK=y +# CONFIG_INITRAMFS_COMPRESSION_LZO is not set +CONFIG_INITRAMFS_ROOT_GID=0 +CONFIG_INITRAMFS_ROOT_UID=0 +CONFIG_INITRAMFS_SOURCE="../../root" +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_IP17XX_PHY=y +CONFIG_IRQ_CPU=y +# CONFIG_LEDS_GPIO is not set +# CONFIG_LEDS_RB750 is not set +# CONFIG_LEDS_WNDR3700_USB is not set +# CONFIG_M25PXX_USE_FAST_READ is not set +# CONFIG_MACH_ALCHEMY is not set +# CONFIG_MACH_DECSTATION is not set +# CONFIG_MACH_JAZZ is not set +# CONFIG_MACH_LOONGSON is not set +# CONFIG_MACH_TX39XX is not set +# CONFIG_MACH_TX49XX is not set +# CONFIG_MACH_VR41XX is not set +CONFIG_MICREL_PHY=y +# CONFIG_MIKROTIK_RB532 is not set +CONFIG_MIPS=y +# CONFIG_MIPS_COBALT is not set +CONFIG_MIPS_L1_CACHE_SHIFT=5 +CONFIG_MIPS_MACHINE=y +# CONFIG_MIPS_MALTA is not set +CONFIG_MIPS_MT_DISABLED=y +# CONFIG_MIPS_MT_SMP is not set +# CONFIG_MIPS_MT_SMTC is not set +# CONFIG_MIPS_SIM is not set +CONFIG_MTD_AR91XX_FLASH=y +# CONFIG_MTD_CFI_INTELEXT is not set +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_M25P80=y +CONFIG_MTD_MYLOADER_PARTS=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_RB4XX=y +CONFIG_MTD_NAND_RB750=y +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_WRT160NL_PARTS=y +CONFIG_MYLOADER=y +CONFIG_NET_DSA=y +CONFIG_NET_DSA_AR7240=y +CONFIG_NET_DSA_MV88E6060=y +CONFIG_NET_DSA_MV88E6063=y +# CONFIG_NET_DSA_MV88E6123_61_65 is not set +# CONFIG_NET_DSA_MV88E6131 is not set +# CONFIG_NET_DSA_MV88E6XXX is not set +# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set +# CONFIG_NET_DSA_TAG_DSA is not set +# CONFIG_NET_DSA_TAG_EDSA is not set +CONFIG_NET_DSA_TAG_QINQ=y +CONFIG_NET_DSA_TAG_TRAILER=y +# CONFIG_NO_IOPORT is not set +# CONFIG_NXP_STB220 is not set +# CONFIG_NXP_STB225 is not set +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_PCI=y +CONFIG_PCI_DISABLE_COMMON_QUIRKS=y +CONFIG_PCI_DOMAINS=y +CONFIG_PHYLIB=y +# CONFIG_PMC_MSP is not set +# CONFIG_PMC_YOSEMITE is not set +# CONFIG_PNX8550_JBS is not set +# CONFIG_PNX8550_STB810 is not set +CONFIG_RTL8306_PHY=y +CONFIG_RTL8366RB_PHY=y +CONFIG_RTL8366S_PHY=y +CONFIG_RTL8366_SMI=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +# CONFIG_SCSI_DMA is not set +# CONFIG_SERIAL_8250_EXTENDED is not set +CONFIG_SERIAL_8250_NR_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 +# CONFIG_SGI_IP22 is not set +# CONFIG_SGI_IP27 is not set +# CONFIG_SGI_IP28 is not set +# CONFIG_SGI_IP32 is not set +# CONFIG_SIBYTE_BIGSUR is not set +# CONFIG_SIBYTE_CARMEL is not set +# CONFIG_SIBYTE_CRHINE is not set +# CONFIG_SIBYTE_CRHONE is not set +# CONFIG_SIBYTE_LITTLESUR is not set +# CONFIG_SIBYTE_RHONE is not set +# CONFIG_SIBYTE_SENTOSA is not set +# CONFIG_SIBYTE_SWARM is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +CONFIG_SPI=y +CONFIG_SPI_AP83=y +CONFIG_SPI_AR71XX=y +CONFIG_SPI_BITBANG=y +CONFIG_SPI_GPIO=y +CONFIG_SPI_MASTER=y +CONFIG_SPI_PB44=y +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_VSC7385 is not set +CONFIG_SWCONFIG=y +CONFIG_SYS_HAS_CPU_MIPS32_R1=y +CONFIG_SYS_HAS_CPU_MIPS32_R2=y +CONFIG_SYS_HAS_EARLY_PRINTK=y +CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y +# CONFIG_TC35815 is not set +CONFIG_TRAD_SIGNALS=y +# CONFIG_TREE_PREEMPT_RCU is not set +CONFIG_TREE_RCU=y +CONFIG_USB_SUPPORT=y +CONFIG_YAFFS_9BYTE_TAGS=y +CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y +CONFIG_YAFFS_AUTO_YAFFS2=y +# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set +# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set +CONFIG_YAFFS_FS=y +CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y +CONFIG_YAFFS_YAFFS1=y +CONFIG_YAFFS_YAFFS2=y +CONFIG_ZONE_DMA_FLAG=0 diff --git a/targets.mk b/targets.mk new file mode 100644 index 0000000..9966b29 --- /dev/null +++ b/targets.mk @@ -0,0 +1,30 @@ +# +# Copyright (C) 2011 qmp.cat +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. +# + +HW_AVAILABLE := alix rs rspro x86 fonera nsm5 nsm2 + +ifeq ($(T),rspro) + NAME:=RouterStationPro + ARCH:=ar71xx + IMAGE:=bin/$(ARCH)/openwrt-ar71xx-ubnt-rspro-squashfs-factory.bin + SYSUPGRADE:=bin/$(ARCH)/openwrt-ar71xx-ubnt-rspro-squashfs-sysupgrade.bin +endif + +ifeq ($(T),rs) + NAME:=RouterStation + ARCH:=ar71xx + IMAGE:=bin/$(ARCH)/openwrt-ar71xx-ubnt-rs-squashfs-factory.bin + SYSUPGRADE:=bin/$(ARCH)/openwrt-ar71xx-ubnt-rs-squashfs-sysupgrade.bin +endif + +ifeq ($(T),alix) + NAME:=Alix + ARCH:=x86 + IMAGE:=bin/$(ARCH)/openwrt-x86-generic-combined-squashfs.img + SYSUPGRADE:=bin/$(ARCH)/openwrt-x86-generic-combined-squashfs.img +endif +