mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-23 22:34:04 +02:00
Merge branch 'backfire' into xburst
This commit is contained in:
Mirko Vogt
commit
62adc73a59
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (C) 2006 OpenWrt.org
|
||||
# Copyright (C) 2006-2010 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=comgt
|
||||
PKG_VERSION:=0.32
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
|
||||
PKG_SOURCE_URL:=@SF/comgt
|
||||
|
||||
@ -91,11 +91,13 @@ setup_interface_3g() {
|
||||
fi
|
||||
# Don't assume Option to be default as it breaks with Huawei Cards/Sticks
|
||||
|
||||
test -z "$pincode" || {
|
||||
PINCODE="$pincode" gcom -d "$device" -s /etc/gcom/setpin.gcom || {
|
||||
echo "$config(3g): Failed to set the PIN code."
|
||||
set_3g_led 0 0 0
|
||||
return 1
|
||||
}
|
||||
}
|
||||
test -z "$mode" || {
|
||||
MODE="$mode" gcom -d "$device" -s /etc/gcom/setmode.gcom
|
||||
}
|
||||
|
||||
@ -12,21 +12,22 @@ define Image/Prepare
|
||||
endef
|
||||
|
||||
define Image/BuildKernel
|
||||
# WRT350N v2: mach id 1633 (0x661)
|
||||
# Orion Kernel uImages
|
||||
# WRT350N v2: mach id 1633 (0x661)
|
||||
echo -en "\x06\x1c\xa0\xe3\x61\x10\x81\xe3" > $(KDIR)/wrt350nv2-zImage
|
||||
cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/wrt350nv2-zImage
|
||||
$(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \
|
||||
-C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \
|
||||
-d $(KDIR)/wrt350nv2-zImage $(KDIR)/wrt350nv2-uImage
|
||||
cp $(KDIR)/wrt350nv2-uImage $(BIN_DIR)/openwrt-wrt350nv2-uImage
|
||||
# WNR854T: mach id 1801 (0x709)
|
||||
# WNR854T: mach id 1801 (0x709)
|
||||
echo -en "\x07\x1c\xa0\xe3\x09\x10\x81\xe3" > $(KDIR)/wnr854t-zImage
|
||||
cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/wnr854t-zImage
|
||||
$(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \
|
||||
-C none -a 0x00008000 -e 0x00008000 -n 'Linux-$(LINUX_VERSION)' \
|
||||
-d $(KDIR)/wnr854t-zImage $(KDIR)/wnr854t-uImage
|
||||
cp $(KDIR)/wnr854t-uImage $(BIN_DIR)/openwrt-wnr854t-uImage
|
||||
# DT2: mach id 1514 (0x5EA)
|
||||
# DT2: mach id 1514 (0x5EA)
|
||||
echo -en "\x05\x1c\xa0\xe3\xea\x10\x81\xe3" > $(KDIR)/dt2-zImage
|
||||
cat $(LINUX_DIR)/arch/arm/boot/zImage >> $(KDIR)/dt2-zImage
|
||||
$(STAGING_DIR_HOST)/bin/mkimage -A arm -O linux -T kernel \
|
||||
@ -36,6 +37,7 @@ define Image/BuildKernel
|
||||
endef
|
||||
|
||||
define Image/Build/Netgear
|
||||
# Orion Netgear Images
|
||||
mkdir $(KDIR)/netgear_image
|
||||
cp $(KDIR)/wnr854t-uImage $(KDIR)/netgear_image/uImage
|
||||
$(STAGING_DIR_HOST)/bin/mkfs.jffs2 -m none -p -l -q -e 128KiB -o $(KDIR)/wnr854t-uImage.jffs2 -d $(KDIR)/netgear_image
|
||||
@ -48,29 +50,29 @@ define Image/Build/Netgear
|
||||
endef
|
||||
|
||||
define Image/Build/Linksys
|
||||
# WRT350N v2 images
|
||||
# sysupgrade image
|
||||
# Orion Linksys Images
|
||||
# sysupgrade image
|
||||
( \
|
||||
dd if="${KDIR}/$2-uImage" bs=$5 conv=sync; \
|
||||
dd if="${KDIR}/root.$1" bs=64k conv=sync; \
|
||||
) > "${BIN_DIR}/openwrt-$2-$1.img"
|
||||
# recovery image and webupgrade image for stock firmware
|
||||
# recovery image and webupgrade image for stock firmware
|
||||
rm -rf "${TMP_DIR}/$2_webupgrade"
|
||||
mkdir "${TMP_DIR}/$2_webupgrade"
|
||||
# create parameter file
|
||||
# create parameter file
|
||||
echo ":kernel $5 ${BIN_DIR}/openwrt-$2-uImage" >"${TMP_DIR}/$2_webupgrade/$2.par"
|
||||
echo ":rootfs 0 ${KDIR}/root.$1" >>"${TMP_DIR}/$2_webupgrade/$2.par"
|
||||
[ ! -f "$(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin" ] || ( \
|
||||
echo ":u-boot 0 $(STAGING_DIR_HOST)/share/wrt350nv2-builder/u-boot.bin" >>"${TMP_DIR}/$2_webupgrade/$2.par"; )
|
||||
echo "#version 0x2020" >>"${TMP_DIR}/$2_webupgrade/$2.par"
|
||||
# create bin file for recovery and webupgrade image
|
||||
# create bin file for recovery and webupgrade image
|
||||
( cd "${TMP_DIR}/$2_webupgrade"; \
|
||||
"${STAGING_DIR_HOST}/bin/$2-builder" \
|
||||
-v -b "${TMP_DIR}/$2_webupgrade/$2.par"; \
|
||||
)
|
||||
# copy bin file as recovery image
|
||||
# copy bin file as recovery image
|
||||
$(CP) "${TMP_DIR}/$2_webupgrade/wrt350n.bin" "$(BIN_DIR)/openwrt-$2-$1-recovery.bin"
|
||||
# create webupgrade image for stock firmware update mechanism
|
||||
# create webupgrade image for stock firmware update mechanism
|
||||
zip "${TMP_DIR}/$2_webupgrade/wrt350n.zip" "${TMP_DIR}/$2_webupgrade/wrt350n.bin"
|
||||
"${STAGING_DIR_HOST}/bin/$2-builder" -v -z "${TMP_DIR}/$2_webupgrade/wrt350n.zip" "${BIN_DIR}/openwrt-$2-$1-webupgrade.img"
|
||||
rm -rf "${TMP_DIR}/$2_webupgrade"
|
||||
@ -87,16 +89,16 @@ define Image/Build/Freecom
|
||||
endef
|
||||
|
||||
define Image/Build
|
||||
$(call Image/Build/$(1),$(1))
|
||||
$(call Image/Build/Netgear,$(1),wnr854t,NG_WNR854T,$(1))
|
||||
$(call Image/Build/Freecom,$(1),dt2,DT,$(1))
|
||||
# Leave WRT350Nv2 at last position due to webimage dependency for zip
|
||||
# 5th parameter is kernel mtd size, e.g. 0x00100000 = 1048576 or 0x001A0000 = 1703936
|
||||
$(call Image/Build/Linksys,$(1),wrt350nv2,WNR350Nv2,$(1),1048576)
|
||||
$(call Image/Build/$(1),$(1))
|
||||
$(call Image/Build/Netgear,$(1),wnr854t,NG_WNR854T,$(1))
|
||||
$(call Image/Build/Freecom,$(1),dt2,DT,$(1))
|
||||
# Leave WRT350Nv2 at last position due to webimage dependency for zip
|
||||
# 5th parameter is kernel mtd size, e.g. 0x00100000 = 1048576 or 0x001A0000 = 1703936
|
||||
$(call Image/Build/Linksys,$(1),wrt350nv2,WNR350Nv2,$(1),1048576)
|
||||
endef
|
||||
|
||||
define Image/Build/squashfs
|
||||
$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
|
||||
$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
|
||||
( \
|
||||
dd if=$(KDIR)/uImage bs=1024k conv=sync; \
|
||||
dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
|
||||
|
||||
@ -13,6 +13,7 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
|
||||
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
|
||||
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
|
||||
CONFIG_ARCH_POPULATES_NODE_MAP=y
|
||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y
|
||||
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
|
||||
CONFIG_ARCH_SPARSEMEM_ENABLE=y
|
||||
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
|
||||
@ -28,15 +29,15 @@ CONFIG_BASE_SMALL=1
|
||||
# CONFIG_BINARY_PRINTF is not set
|
||||
CONFIG_BITREVERSE=y
|
||||
# CONFIG_BLK_DEV_INITRD is not set
|
||||
CONFIG_BLK_DEV_RAM=y
|
||||
CONFIG_BLK_DEV_RAM_COUNT=16
|
||||
CONFIG_BLK_DEV_RAM_SIZE=4096
|
||||
CONFIG_BLK_DEV_RAM=y
|
||||
CONFIG_BOUNCE=y
|
||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||
# CONFIG_CC_STACKPROTECTOR is not set
|
||||
CONFIG_CLOCKSOURCE_WATCHDOG=y
|
||||
CONFIG_CMDLINE="console=uart,io,0x3f8 rootfstype=squashfs,jffs2"
|
||||
CONFIG_CMDLINE_BOOL=y
|
||||
CONFIG_CMDLINE="console=ttyS0,38400 rootfstype=squashfs,jffs2"
|
||||
# CONFIG_CMDLINE_OVERRIDE is not set
|
||||
# CONFIG_COMPAT_NET_DEV_OPS is not set
|
||||
# CONFIG_COMPAT_VDSO is not set
|
||||
@ -66,8 +67,8 @@ CONFIG_FIX_EARLYCON_MEM=y
|
||||
# CONFIG_FRAME_POINTER is not set
|
||||
# CONFIG_FTRACE_SYSCALLS is not set
|
||||
CONFIG_GENERIC_BUG=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
CONFIG_GENERIC_CMOS_UPDATE=y
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
CONFIG_GENERIC_FIND_FIRST_BIT=y
|
||||
@ -98,8 +99,8 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
|
||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
|
||||
CONFIG_HAVE_FTRACE_SYSCALLS=y
|
||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
|
||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
|
||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
|
||||
CONFIG_HAVE_IDE=y
|
||||
CONFIG_HAVE_IOREMAP_PROT=y
|
||||
@ -108,8 +109,8 @@ CONFIG_HAVE_KERNEL_GZIP=y
|
||||
CONFIG_HAVE_KERNEL_LZMA=y
|
||||
CONFIG_HAVE_KPROBES=y
|
||||
CONFIG_HAVE_KRETPROBES=y
|
||||
CONFIG_HAVE_KVM_IRQCHIP=y
|
||||
CONFIG_HAVE_KVM=y
|
||||
CONFIG_HAVE_KVM_IRQCHIP=y
|
||||
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
|
||||
CONFIG_HAVE_MLOCK=y
|
||||
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
|
||||
@ -123,13 +124,15 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
|
||||
# CONFIG_HP_WATCHDOG is not set
|
||||
# CONFIG_HUGETLBFS is not set
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
# CONFIG_HZ_100 is not set
|
||||
CONFIG_HZ=250
|
||||
# CONFIG_HZ_100 is not set
|
||||
CONFIG_HZ_250=y
|
||||
# CONFIG_I6300ESB_WDT is not set
|
||||
# CONFIG_I8K is not set
|
||||
# CONFIG_IB700_WDT is not set
|
||||
# CONFIG_IBMASR is not set
|
||||
# CONFIG_IOMMU_API is not set
|
||||
# CONFIG_IOMMU_HELPER is not set
|
||||
CONFIG_IO_DELAY_0X80=y
|
||||
# CONFIG_IO_DELAY_0XED is not set
|
||||
# CONFIG_IO_DELAY_NONE is not set
|
||||
@ -138,18 +141,15 @@ CONFIG_IO_DELAY_TYPE_0XED=1
|
||||
CONFIG_IO_DELAY_TYPE_NONE=3
|
||||
CONFIG_IO_DELAY_TYPE_UDELAY=2
|
||||
# CONFIG_IO_DELAY_UDELAY is not set
|
||||
# CONFIG_IOMMU_API is not set
|
||||
# CONFIG_IOMMU_HELPER is not set
|
||||
# CONFIG_IP_MROUTE is not set
|
||||
CONFIG_ISA_DMA_API=y
|
||||
# CONFIG_ISA is not set
|
||||
CONFIG_ISA_DMA_API=y
|
||||
# CONFIG_ISCSI_IBFT_FIND is not set
|
||||
# CONFIG_IT8712F_WDT is not set
|
||||
# CONFIG_IT87_WDT is not set
|
||||
# CONFIG_ITCO_WDT is not set
|
||||
# CONFIG_JFFS2_SUMMARY is not set
|
||||
CONFIG_KTIME_SCALAR=y
|
||||
CONFIG_LBD=y
|
||||
# CONFIG_LEDS_ALIX2 is not set
|
||||
CONFIG_LEDS_GPIO=y
|
||||
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
|
||||
@ -178,16 +178,14 @@ CONFIG_MATH_EMULATION=y
|
||||
# CONFIG_MMIOTRACE is not set
|
||||
CONFIG_MODULE_FORCE_UNLOAD=y
|
||||
# CONFIG_MPENTIUM4 is not set
|
||||
# CONFIG_MPENTIUMIII is not set
|
||||
# CONFIG_MPENTIUMII is not set
|
||||
# CONFIG_MPENTIUMIII is not set
|
||||
# CONFIG_MPENTIUMM is not set
|
||||
# CONFIG_MPSC is not set
|
||||
# CONFIG_MTD_CFI_INTELEXT is not set
|
||||
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
|
||||
# CONFIG_MTD_NETSC520 is not set
|
||||
CONFIG_MTD_PHYSMAP=y
|
||||
# CONFIG_MTD_R8610 is not set
|
||||
# CONFIG_MTD_RDC3210 is not set
|
||||
# CONFIG_MTD_TS5500 is not set
|
||||
# CONFIG_MTRR is not set
|
||||
# CONFIG_MVIAC3_2 is not set
|
||||
@ -206,11 +204,11 @@ CONFIG_PAGE_OFFSET=0xC0000000
|
||||
# CONFIG_PC8736x_GPIO is not set
|
||||
# CONFIG_PC87413_WDT is not set
|
||||
CONFIG_PCI=y
|
||||
# CONFIG_PCIEPORTBUS is not set
|
||||
CONFIG_PCI_BIOS=y
|
||||
CONFIG_PCI_DIRECT=y
|
||||
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
|
||||
CONFIG_PCI_DOMAINS=y
|
||||
# CONFIG_PCIEPORTBUS is not set
|
||||
CONFIG_PCI_GOANY=y
|
||||
# CONFIG_PCI_GOBIOS is not set
|
||||
# CONFIG_PCI_GODIRECT is not set
|
||||
@ -255,16 +253,17 @@ CONFIG_USER_STACKTRACE_SUPPORT=y
|
||||
# CONFIG_VMSPLIT_3G_OPT is not set
|
||||
# CONFIG_W83697UG_WDT is not set
|
||||
# CONFIG_WAFER_WDT is not set
|
||||
CONFIG_X86_32_LAZY_GS=y
|
||||
CONFIG_X86=y
|
||||
CONFIG_X86_32=y
|
||||
CONFIG_X86_32_LAZY_GS=y
|
||||
# CONFIG_X86_64 is not set
|
||||
CONFIG_X86_ALIGNMENT_16=y
|
||||
CONFIG_X86_BSWAP=y
|
||||
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
|
||||
CONFIG_X86_CMPXCHG=y
|
||||
# CONFIG_X86_CPU_DEBUG is not set
|
||||
# CONFIG_X86_CPUID is not set
|
||||
CONFIG_X86_CPU=y
|
||||
# CONFIG_X86_CPUID is not set
|
||||
# CONFIG_X86_CPU_DEBUG is not set
|
||||
# CONFIG_X86_ELAN is not set
|
||||
CONFIG_X86_EXTENDED_PLATFORM=y
|
||||
CONFIG_X86_F00F_BUG=y
|
||||
@ -281,12 +280,10 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=4
|
||||
CONFIG_X86_POPAD_OK=y
|
||||
# CONFIG_X86_PPRO_FENCE is not set
|
||||
CONFIG_X86_RDC321X=y
|
||||
# CONFIG_X86_REBOOTFIXUPS is not set
|
||||
CONFIG_X86_REBOOTFIXUPS=y
|
||||
# CONFIG_X86_RESERVE_LOW_64K is not set
|
||||
# CONFIG_X86_UP_APIC is not set
|
||||
# CONFIG_X86_VERBOSE_BOOTUP is not set
|
||||
CONFIG_X86_WP_WORKS_OK=y
|
||||
CONFIG_X86_XADD=y
|
||||
CONFIG_X86=y
|
||||
# CONFIG_ZONE_DMA32 is not set
|
||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y
|
||||
|
||||
@ -1,289 +0,0 @@
|
||||
# CONFIG_4KSTACKS is not set
|
||||
# CONFIG_60XX_WDT is not set
|
||||
# CONFIG_64BIT is not set
|
||||
# CONFIG_ACQUIRE_WDT is not set
|
||||
# CONFIG_ADVANTECH_WDT is not set
|
||||
# CONFIG_ALIM1535_WDT is not set
|
||||
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
|
||||
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
|
||||
CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
|
||||
CONFIG_ARCH_HAS_CPU_RELAX=y
|
||||
CONFIG_ARCH_HAS_DEFAULT_IDLE=y
|
||||
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
|
||||
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
|
||||
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
|
||||
CONFIG_ARCH_POPULATES_NODE_MAP=y
|
||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y
|
||||
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
|
||||
CONFIG_ARCH_SPARSEMEM_ENABLE=y
|
||||
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
|
||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
||||
CONFIG_ARCH_WANT_FRAME_POINTERS=y
|
||||
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
|
||||
# CONFIG_ARPD is not set
|
||||
# CONFIG_AUDIT_ARCH is not set
|
||||
# CONFIG_BASE_FULL is not set
|
||||
CONFIG_BASE_SMALL=1
|
||||
CONFIG_BITREVERSE=y
|
||||
# CONFIG_BLK_DEV_INITRD is not set
|
||||
CONFIG_BLK_DEV_RAM=y
|
||||
CONFIG_BLK_DEV_RAM_COUNT=16
|
||||
CONFIG_BLK_DEV_RAM_SIZE=4096
|
||||
CONFIG_BOUNCE=y
|
||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||
# CONFIG_CC_STACKPROTECTOR is not set
|
||||
CONFIG_CFG80211_DEFAULT_PS_VALUE=0
|
||||
CONFIG_CLOCKSOURCE_WATCHDOG=y
|
||||
CONFIG_CMDLINE="console=ttyS0,38400 rootfstype=squashfs,jffs2"
|
||||
CONFIG_CMDLINE_BOOL=y
|
||||
# CONFIG_CMDLINE_OVERRIDE is not set
|
||||
# CONFIG_COMPAT_VDSO is not set
|
||||
# CONFIG_CPU5_WDT is not set
|
||||
# CONFIG_CPU_SUP_AMD is not set
|
||||
# CONFIG_CPU_SUP_CENTAUR is not set
|
||||
# CONFIG_CPU_SUP_CYRIX_32 is not set
|
||||
# CONFIG_CPU_SUP_INTEL is not set
|
||||
# CONFIG_CPU_SUP_TRANSMETA_32 is not set
|
||||
# CONFIG_CPU_SUP_UMC_32 is not set
|
||||
# CONFIG_CS5535_GPIO is not set
|
||||
# CONFIG_DCDBAS is not set
|
||||
# CONFIG_DEBUG_FS is not set
|
||||
CONFIG_DECOMPRESS_LZMA=y
|
||||
CONFIG_DEFAULT_IO_DELAY_TYPE=0
|
||||
# CONFIG_DELL_RBU is not set
|
||||
CONFIG_DEVPORT=y
|
||||
# CONFIG_DMI is not set
|
||||
CONFIG_DOUBLEFAULT=y
|
||||
# CONFIG_EARLY_PRINTK is not set
|
||||
# CONFIG_EDD is not set
|
||||
# CONFIG_EUROTECH_WDT is not set
|
||||
# CONFIG_FIRMWARE_MEMMAP is not set
|
||||
CONFIG_FIX_EARLYCON_MEM=y
|
||||
# CONFIG_FRAME_POINTER is not set
|
||||
# CONFIG_FSNOTIFY is not set
|
||||
CONFIG_GENERIC_BUG=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
CONFIG_GENERIC_CMOS_UPDATE=y
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
CONFIG_GENERIC_FIND_FIRST_BIT=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_GENERIC_IOMAP=y
|
||||
CONFIG_GENERIC_ISA_DMA=y
|
||||
# CONFIG_GENERIC_TIME_VSYSCALL is not set
|
||||
# CONFIG_GEN_RTC is not set
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_GPIO_SYSFS=y
|
||||
# CONFIG_HAMRADIO is not set
|
||||
# CONFIG_HANGCHECK_TIMER is not set
|
||||
CONFIG_HAS_DMA=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT=y
|
||||
CONFIG_HAVE_AOUT=y
|
||||
CONFIG_HAVE_ARCH_KGDB=y
|
||||
CONFIG_HAVE_ARCH_KMEMCHECK=y
|
||||
CONFIG_HAVE_ARCH_TRACEHOOK=y
|
||||
CONFIG_HAVE_ATOMIC_IOMAP=y
|
||||
# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
|
||||
CONFIG_HAVE_DMA_API_DEBUG=y
|
||||
CONFIG_HAVE_DMA_ATTRS=y
|
||||
CONFIG_HAVE_DYNAMIC_FTRACE=y
|
||||
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
|
||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
|
||||
CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
|
||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
||||
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
|
||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
|
||||
CONFIG_HAVE_IDE=y
|
||||
CONFIG_HAVE_IOREMAP_PROT=y
|
||||
CONFIG_HAVE_KERNEL_BZIP2=y
|
||||
CONFIG_HAVE_KERNEL_GZIP=y
|
||||
CONFIG_HAVE_KERNEL_LZMA=y
|
||||
CONFIG_HAVE_KERNEL_LZO=y
|
||||
CONFIG_HAVE_KPROBES=y
|
||||
CONFIG_HAVE_KRETPROBES=y
|
||||
CONFIG_HAVE_KVM=y
|
||||
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
|
||||
CONFIG_HAVE_MMIOTRACE_SUPPORT=y
|
||||
CONFIG_HAVE_OPROFILE=y
|
||||
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
|
||||
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
|
||||
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
|
||||
# CONFIG_HIGHMEM4G is not set
|
||||
# CONFIG_HIGHMEM64G is not set
|
||||
# CONFIG_HIGH_RES_TIMERS is not set
|
||||
# CONFIG_HPET_TIMER is not set
|
||||
# CONFIG_HP_WATCHDOG is not set
|
||||
# CONFIG_HUGETLBFS is not set
|
||||
# CONFIG_HW_RANDOM is not set
|
||||
CONFIG_HZ=250
|
||||
# CONFIG_HZ_100 is not set
|
||||
CONFIG_HZ_250=y
|
||||
# CONFIG_I6300ESB_WDT is not set
|
||||
# CONFIG_I8K is not set
|
||||
# CONFIG_IB700_WDT is not set
|
||||
# CONFIG_IBMASR is not set
|
||||
# CONFIG_IOMMU_API is not set
|
||||
# CONFIG_IOMMU_HELPER is not set
|
||||
# CONFIG_IOMMU_STRESS is not set
|
||||
CONFIG_IO_DELAY_0X80=y
|
||||
# CONFIG_IO_DELAY_0XED is not set
|
||||
# CONFIG_IO_DELAY_NONE is not set
|
||||
CONFIG_IO_DELAY_TYPE_0X80=0
|
||||
CONFIG_IO_DELAY_TYPE_0XED=1
|
||||
CONFIG_IO_DELAY_TYPE_NONE=3
|
||||
CONFIG_IO_DELAY_TYPE_UDELAY=2
|
||||
# CONFIG_IO_DELAY_UDELAY is not set
|
||||
# CONFIG_IP_MROUTE is not set
|
||||
# CONFIG_ISA is not set
|
||||
CONFIG_ISA_DMA_API=y
|
||||
# CONFIG_ISCSI_IBFT_FIND is not set
|
||||
# CONFIG_IT8712F_WDT is not set
|
||||
# CONFIG_IT87_WDT is not set
|
||||
# CONFIG_ITCO_WDT is not set
|
||||
# CONFIG_JFFS2_SUMMARY is not set
|
||||
CONFIG_KTIME_SCALAR=y
|
||||
# CONFIG_LEDS_ALIX2 is not set
|
||||
CONFIG_LEDS_GPIO=y
|
||||
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
|
||||
# CONFIG_LEDS_TRIGGER_NETDEV is not set
|
||||
# CONFIG_LEDS_TRIGGER_TIMER is not set
|
||||
# CONFIG_M386 is not set
|
||||
CONFIG_M486=y
|
||||
# CONFIG_M586 is not set
|
||||
# CONFIG_M586MMX is not set
|
||||
# CONFIG_M586TSC is not set
|
||||
# CONFIG_M686 is not set
|
||||
# CONFIG_MACHZ_WDT is not set
|
||||
CONFIG_MATH_EMULATION=y
|
||||
# CONFIG_MATOM is not set
|
||||
# CONFIG_MCA is not set
|
||||
# CONFIG_MCORE2 is not set
|
||||
# CONFIG_MCRUSOE is not set
|
||||
# CONFIG_MCYRIXIII is not set
|
||||
# CONFIG_MEFFICEON is not set
|
||||
# CONFIG_MEMTEST is not set
|
||||
# CONFIG_MGEODEGX1 is not set
|
||||
# CONFIG_MGEODE_LX is not set
|
||||
# CONFIG_MICROCODE is not set
|
||||
# CONFIG_MK6 is not set
|
||||
# CONFIG_MK7 is not set
|
||||
# CONFIG_MK8 is not set
|
||||
CONFIG_MODULE_FORCE_UNLOAD=y
|
||||
# CONFIG_MPENTIUM4 is not set
|
||||
# CONFIG_MPENTIUMII is not set
|
||||
# CONFIG_MPENTIUMIII is not set
|
||||
# CONFIG_MPENTIUMM is not set
|
||||
# CONFIG_MPSC is not set
|
||||
# CONFIG_MTD_CFI_INTELEXT is not set
|
||||
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
|
||||
# CONFIG_MTD_NETSC520 is not set
|
||||
CONFIG_MTD_PHYSMAP=y
|
||||
# CONFIG_MTD_R8610 is not set
|
||||
# CONFIG_MTD_RDC3210 is not set
|
||||
# CONFIG_MTD_TS5500 is not set
|
||||
# CONFIG_MTRR is not set
|
||||
# CONFIG_MVIAC3_2 is not set
|
||||
# CONFIG_MVIAC7 is not set
|
||||
# CONFIG_MWINCHIP3D is not set
|
||||
# CONFIG_MWINCHIPC6 is not set
|
||||
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
|
||||
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
|
||||
# CONFIG_NETDEV_1000 is not set
|
||||
CONFIG_NOHIGHMEM=y
|
||||
CONFIG_NR_CPUS=1
|
||||
# CONFIG_NSC_GPIO is not set
|
||||
# CONFIG_OLPC is not set
|
||||
# CONFIG_OPTIMIZE_INLINING is not set
|
||||
CONFIG_OUTPUT_FORMAT="elf32-i386"
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
CONFIG_PAGE_OFFSET=0xC0000000
|
||||
# CONFIG_PARAVIRT_GUEST is not set
|
||||
# CONFIG_PC8736x_GPIO is not set
|
||||
# CONFIG_PC87413_WDT is not set
|
||||
CONFIG_PCI=y
|
||||
# CONFIG_PCIEPORTBUS is not set
|
||||
CONFIG_PCI_BIOS=y
|
||||
CONFIG_PCI_DIRECT=y
|
||||
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
|
||||
CONFIG_PCI_DOMAINS=y
|
||||
CONFIG_PCI_GOANY=y
|
||||
# CONFIG_PCI_GOBIOS is not set
|
||||
# CONFIG_PCI_GODIRECT is not set
|
||||
# CONFIG_PCI_GOMMCONFIG is not set
|
||||
# CONFIG_PCI_GOOLPC is not set
|
||||
# CONFIG_PCI_QUIRKS is not set
|
||||
CONFIG_PHYSICAL_ALIGN=0x100000
|
||||
CONFIG_PHYSICAL_START=0x100000
|
||||
CONFIG_PROCESSOR_SELECT=y
|
||||
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
|
||||
CONFIG_RDC321X_WDT=m
|
||||
# CONFIG_RELOCATABLE is not set
|
||||
# CONFIG_RTC is not set
|
||||
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
|
||||
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
|
||||
# CONFIG_SBC7240_WDT is not set
|
||||
# CONFIG_SBC8360_WDT is not set
|
||||
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
|
||||
# CONFIG_SC1200_WDT is not set
|
||||
# CONFIG_SC520_WDT is not set
|
||||
# CONFIG_SCHED_HRTICK is not set
|
||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||
# CONFIG_SCSI_DMA is not set
|
||||
# CONFIG_SCx200 is not set
|
||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||
# CONFIG_SHMEM is not set
|
||||
# CONFIG_SMSC37B787_WDT is not set
|
||||
# CONFIG_SMSC_SCH311X_WDT is not set
|
||||
CONFIG_SPARSEMEM_STATIC=y
|
||||
# CONFIG_STRICT_DEVMEM is not set
|
||||
# CONFIG_TELCLOCK is not set
|
||||
# CONFIG_TOSHIBA is not set
|
||||
# CONFIG_TREE_PREEMPT_RCU is not set
|
||||
CONFIG_TREE_RCU=y
|
||||
CONFIG_UID16=y
|
||||
CONFIG_USB_SUPPORT=y
|
||||
CONFIG_USER_STACKTRACE_SUPPORT=y
|
||||
# CONFIG_VM86 is not set
|
||||
# CONFIG_W83697UG_WDT is not set
|
||||
# CONFIG_WAFER_WDT is not set
|
||||
CONFIG_X86=y
|
||||
CONFIG_X86_32=y
|
||||
CONFIG_X86_32_LAZY_GS=y
|
||||
# CONFIG_X86_64 is not set
|
||||
CONFIG_X86_ALIGNMENT_16=y
|
||||
CONFIG_X86_BSWAP=y
|
||||
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
|
||||
CONFIG_X86_CMPXCHG=y
|
||||
CONFIG_X86_CPU=y
|
||||
# CONFIG_X86_CPUID is not set
|
||||
# CONFIG_X86_ELAN is not set
|
||||
CONFIG_X86_EXTENDED_PLATFORM=y
|
||||
CONFIG_X86_F00F_BUG=y
|
||||
# CONFIG_X86_GENERIC is not set
|
||||
CONFIG_X86_INTERNODE_CACHE_BYTES=64
|
||||
CONFIG_X86_INVLPG=y
|
||||
CONFIG_X86_L1_CACHE_BYTES=64
|
||||
CONFIG_X86_L1_CACHE_SHIFT=4
|
||||
# CONFIG_X86_MCE is not set
|
||||
CONFIG_X86_MINIMUM_CPU_FAMILY=4
|
||||
# CONFIG_X86_MRST is not set
|
||||
# CONFIG_X86_MSR is not set
|
||||
# CONFIG_X86_PAE is not set
|
||||
# CONFIG_X86_PLATFORM_DEVICES is not set
|
||||
CONFIG_X86_POPAD_OK=y
|
||||
# CONFIG_X86_PPRO_FENCE is not set
|
||||
CONFIG_X86_RDC321X=y
|
||||
CONFIG_X86_REBOOTFIXUPS=y
|
||||
# CONFIG_X86_RESERVE_LOW_64K is not set
|
||||
# CONFIG_X86_UP_APIC is not set
|
||||
# CONFIG_X86_VERBOSE_BOOTUP is not set
|
||||
CONFIG_X86_WP_WORKS_OK=y
|
||||
CONFIG_X86_XADD=y
|
||||
# CONFIG_ZONE_DMA32 is not set
|
||||
@ -1,12 +0,0 @@
|
||||
--- a/arch/x86/Makefile
|
||||
+++ b/arch/x86/Makefile
|
||||
@@ -125,6 +125,9 @@ libs-y += arch/x86/lib/
|
||||
# See arch/x86/Kbuild for content of core part of the kernel
|
||||
core-y += arch/x86/
|
||||
|
||||
+# RDC R-321X support
|
||||
+core-$(CONFIG_X86_RDC321X) += arch/x86/mach-rdc321x/
|
||||
+
|
||||
# drivers-y are linked after core-y
|
||||
drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
|
||||
drivers-$(CONFIG_PCI) += arch/x86/pci/
|
||||
@ -1,20 +0,0 @@
|
||||
--- a/drivers/pcmcia/yenta_socket.c
|
||||
+++ b/drivers/pcmcia/yenta_socket.c
|
||||
@@ -1174,6 +1174,17 @@ static int __devinit yenta_probe (struct
|
||||
|
||||
/* We must finish initialization here */
|
||||
|
||||
+#ifdef CONFIG_X86_RDC321X
|
||||
+/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044f044 */
|
||||
+#define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0844b060
|
||||
+/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044d044 */
|
||||
+
|
||||
+ config_writel(socket, 32*4, YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK);
|
||||
+ config_writel(socket, 35*4, 0x00000022);
|
||||
+ config_writel(socket, 36*4, 0x60200000);
|
||||
+ config_writel(socket, 40*4, 0x7e020000);
|
||||
+#endif
|
||||
+
|
||||
if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, IRQF_SHARED, "yenta", socket)) {
|
||||
/* No IRQ or request_irq failed. Poll */
|
||||
socket->cb_irq = 0; /* But zero is a valid IRQ number. */
|
||||
@ -1,40 +0,0 @@
|
||||
--- a/arch/x86/boot/boot.h
|
||||
+++ b/arch/x86/boot/boot.h
|
||||
@@ -64,7 +64,7 @@ static inline void outl(u32 v, u16 port)
|
||||
{
|
||||
asm volatile("outl %0,%1" : : "a" (v), "dN" (port));
|
||||
}
|
||||
-static inline u32 inl(u32 port)
|
||||
+static inline u32 inl(u16 port)
|
||||
{
|
||||
u32 v;
|
||||
asm volatile("inl %1,%0" : "=a" (v) : "dN" (port));
|
||||
--- a/arch/x86/boot/pm.c
|
||||
+++ b/arch/x86/boot/pm.c
|
||||
@@ -14,6 +14,9 @@
|
||||
|
||||
#include "boot.h"
|
||||
#include <asm/segment.h>
|
||||
+#ifdef CONFIG_X86_RDC321X
|
||||
+#include <asm/rdc321x_defs.h>
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Invoke the realmode switch hook if present; otherwise
|
||||
@@ -112,6 +115,16 @@ void go_to_protected_mode(void)
|
||||
die();
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_X86_RDC321X
|
||||
+ {
|
||||
+ u32 bootctl;
|
||||
+
|
||||
+ outl(0x80003840, RDC3210_CFGREG_ADDR);
|
||||
+ bootctl = inl(RDC3210_CFGREG_DATA) | 0x07ff0000;
|
||||
+ outl(bootctl, RDC3210_CFGREG_DATA);
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
/* Reset coprocessor (IGNNE#) */
|
||||
reset_coprocessor();
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/arch/x86/Kconfig
|
||||
+++ b/arch/x86/Kconfig
|
||||
@@ -400,6 +400,8 @@ config X86_RDC321X
|
||||
depends on X86_EXTENDED_PLATFORM
|
||||
select M486
|
||||
select X86_REBOOTFIXUPS
|
||||
+ select EMBEDDED
|
||||
+ select ARCH_REQUIRE_GPIOLIB
|
||||
---help---
|
||||
This option is needed for RDC R-321x system-on-chip, also known
|
||||
as R-8610-(G).
|
||||
@ -1,176 +0,0 @@
|
||||
--- /dev/null
|
||||
+++ b/Documentation/x86/rdc.txt
|
||||
@@ -0,0 +1,69 @@
|
||||
+
|
||||
+Introduction
|
||||
+============
|
||||
+
|
||||
+RDC (http://www.rdc.com.tw) have been manufacturing x86-compatible SoC
|
||||
+(system-on-chips) for a number of years. They are not the fastest of
|
||||
+CPUs (clock speeds ranging from 133-150MHz) but 486SX compatibility
|
||||
+coupled with very low power consumption[1] and low cost make them ideal
|
||||
+for embedded applications.
|
||||
+
|
||||
+
|
||||
+Where to find
|
||||
+=============
|
||||
+
|
||||
+RDC chips show up in numerous embedded devices, but be careful since
|
||||
+many of them will not run Linux 2.6 without significant expertise.
|
||||
+
|
||||
+There are several variants of what the linux kernel refers to generically
|
||||
+as RDC321X: R8610, R321x, S3282 and AMRISC20000.
|
||||
+
|
||||
+R321x: Found in various routers, see the OpenWrt project for details,
|
||||
+ http://wiki.openwrt.org/oldwiki/rdcport
|
||||
+
|
||||
+R8610: Found on the RDC evaluation board
|
||||
+ http://www.ivankuten.com/system-on-chip-soc/rdc-r8610/
|
||||
+
|
||||
+AMRISC20000: Found in the MGB-100 wireless hard disk
|
||||
+ http://tintuc.no-ip.com/linux/tipps/mgb100/
|
||||
+
|
||||
+S3282: Found in various NAS devices, including the Bifferboard
|
||||
+ http://www.bifferos.com
|
||||
+
|
||||
+
|
||||
+Kernel Configuration
|
||||
+====================
|
||||
+
|
||||
+Add support for this CPU with CONFIG_X86_RDC321X. Ensure that maths
|
||||
+emulation is included (CONFIG_MATH_EMULATION selected) and avoid MCE
|
||||
+(CONFIG_X86_MCE not selected).
|
||||
+
|
||||
+
|
||||
+CPU detection
|
||||
+=============
|
||||
+
|
||||
+None of these chips support the cpuid instruction, so as with some
|
||||
+other x86 compatible SoCs, we must check the north bridge and look
|
||||
+for specific 'signature' PCI device config.
|
||||
+
|
||||
+The current detection code has been tested only on the Bifferboard
|
||||
+(S3282 CPU), please send bug reports or success stories with
|
||||
+other devices to bifferos@yahoo.co.uk.
|
||||
+
|
||||
+
|
||||
+Credits
|
||||
+=======
|
||||
+
|
||||
+Many thanks to RDC for providing the customer codes to allow
|
||||
+detection of all known variants, without which this detection code
|
||||
+would have been very hard to ascertain.
|
||||
+
|
||||
+
|
||||
+References
|
||||
+==========
|
||||
+
|
||||
+[1] S3282 in certain NAS solutions consumes less than 1W
|
||||
+
|
||||
+
|
||||
+mark@bifferos.com 2009
|
||||
+
|
||||
--- a/arch/x86/Kconfig
|
||||
+++ b/arch/x86/Kconfig
|
||||
@@ -398,6 +398,7 @@ config X86_RDC321X
|
||||
bool "RDC R-321x SoC"
|
||||
depends on X86_32
|
||||
depends on X86_EXTENDED_PLATFORM
|
||||
+ select PCI
|
||||
select M486
|
||||
select X86_REBOOTFIXUPS
|
||||
select EMBEDDED
|
||||
--- a/arch/x86/include/asm/processor.h
|
||||
+++ b/arch/x86/include/asm/processor.h
|
||||
@@ -122,7 +122,8 @@ struct cpuinfo_x86 {
|
||||
#define X86_VENDOR_CENTAUR 5
|
||||
#define X86_VENDOR_TRANSMETA 7
|
||||
#define X86_VENDOR_NSC 8
|
||||
-#define X86_VENDOR_NUM 9
|
||||
+#define X86_VENDOR_RDC 9
|
||||
+#define X86_VENDOR_NUM 10
|
||||
|
||||
#define X86_VENDOR_UNKNOWN 0xff
|
||||
|
||||
--- a/arch/x86/kernel/cpu/Makefile
|
||||
+++ b/arch/x86/kernel/cpu/Makefile
|
||||
@@ -24,6 +24,7 @@ obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix
|
||||
obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o
|
||||
obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o
|
||||
obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o
|
||||
+obj-$(CONFIG_X86_RDC321X) += rdc.o
|
||||
|
||||
obj-$(CONFIG_PERF_EVENTS) += perf_event.o
|
||||
|
||||
--- /dev/null
|
||||
+++ b/arch/x86/kernel/cpu/rdc.c
|
||||
@@ -0,0 +1,69 @@
|
||||
+/*
|
||||
+ * See Documentation/x86/rdc.txt
|
||||
+ *
|
||||
+ * mark@bifferos.com
|
||||
+ */
|
||||
+
|
||||
+#include <linux/pci.h>
|
||||
+#include <asm/pci-direct.h>
|
||||
+#include "cpu.h"
|
||||
+
|
||||
+
|
||||
+static void __cpuinit rdc_identify(struct cpuinfo_x86 *c)
|
||||
+{
|
||||
+ u16 vendor, device;
|
||||
+ u32 customer_id;
|
||||
+
|
||||
+ if (!early_pci_allowed())
|
||||
+ return;
|
||||
+
|
||||
+ /* RDC CPU is SoC (system-on-chip), Northbridge is always present */
|
||||
+ vendor = read_pci_config_16(0, 0, 0, PCI_VENDOR_ID);
|
||||
+ device = read_pci_config_16(0, 0, 0, PCI_DEVICE_ID);
|
||||
+
|
||||
+ if (vendor != PCI_VENDOR_ID_RDC || device != PCI_DEVICE_ID_RDC_R6020)
|
||||
+ return; /* not RDC */
|
||||
+ /*
|
||||
+ * NB: We could go on and check other devices, e.g. r6040 NIC, but
|
||||
+ * that's probably overkill
|
||||
+ */
|
||||
+
|
||||
+ customer_id = read_pci_config(0, 0, 0, 0x90);
|
||||
+
|
||||
+ switch (customer_id) {
|
||||
+ /* id names are from RDC */
|
||||
+ case 0x00321000:
|
||||
+ strcpy(c->x86_model_id, "R3210/R3211");
|
||||
+ break;
|
||||
+ case 0x00321001:
|
||||
+ strcpy(c->x86_model_id, "AMITRISC20000/20010");
|
||||
+ break;
|
||||
+ case 0x00321002:
|
||||
+ strcpy(c->x86_model_id, "R3210X/Edimax");
|
||||
+ break;
|
||||
+ case 0x00321003:
|
||||
+ strcpy(c->x86_model_id, "R3210/Kcodes");
|
||||
+ break;
|
||||
+ case 0x00321004: /* tested */
|
||||
+ strcpy(c->x86_model_id, "S3282/CodeTek");
|
||||
+ break;
|
||||
+ case 0x00321007:
|
||||
+ strcpy(c->x86_model_id, "R8610");
|
||||
+ break;
|
||||
+ default:
|
||||
+ pr_info("RDC CPU: Unrecognised Customer ID (0x%x) please report to linux-kernel@vger.kernel.org\n", customer_id);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ strcpy(c->x86_vendor_id, "RDC");
|
||||
+ c->x86_vendor = X86_VENDOR_RDC;
|
||||
+}
|
||||
+
|
||||
+static const struct cpu_dev __cpuinitconst rdc_cpu_dev = {
|
||||
+ .c_vendor = "RDC",
|
||||
+ .c_ident = { "RDC" },
|
||||
+ .c_identify = rdc_identify,
|
||||
+ .c_x86_vendor = X86_VENDOR_RDC,
|
||||
+};
|
||||
+
|
||||
+cpu_dev_register(rdc_cpu_dev);
|
||||
@ -8,7 +8,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=wrt350nv2-builder
|
||||
PKG_VERSION:=2.2
|
||||
PKG_VERSION:=2.3
|
||||
|
||||
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/${PKG_NAME}-$(PKG_VERSION)
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/*
|
||||
|
||||
WRT350Nv2-Builder 2.2 (previously called buildimg)
|
||||
WRT350Nv2-Builder 2.3 (previously called buildimg)
|
||||
Copyright (C) 2008-2009 Dirk Teurlings <info@upexia.nl>
|
||||
Copyright (C) 2009-2010 Matthias Buecher (http://www.maddes.net/)
|
||||
|
||||
@ -62,6 +62,8 @@
|
||||
https://forum.openwrt.org/viewtopic.php?pid=92928#p92928
|
||||
|
||||
Changelog:
|
||||
v2.3 - allow jffs by adding its magic number (0x8519)
|
||||
added parameter option -i to ignore unknown magic numbers
|
||||
v2.2 - fixed checksum byte calculation for other versions than 0x2019
|
||||
fixed rare problem with padsize
|
||||
updated info to stock firmware 2.00.20
|
||||
@ -90,7 +92,7 @@
|
||||
|
||||
|
||||
// version info
|
||||
#define VERSION "2.2"
|
||||
#define VERSION "2.3"
|
||||
char program_info[] = "WRT350Nv2-Builder v%s by Dirk Teurlings <info@upexia.nl> and Matthias Buecher (http://www.maddes.net/)\n";
|
||||
|
||||
// verbosity
|
||||
@ -708,6 +710,7 @@ int main(int argc, char *argv[]) {
|
||||
int help;
|
||||
int onlybin;
|
||||
int havezip;
|
||||
int ignoremagic;
|
||||
char option;
|
||||
char *par_filename = NULL;
|
||||
char *img_filename = NULL;
|
||||
@ -723,7 +726,8 @@ int main(int argc, char *argv[]) {
|
||||
int mandatory;
|
||||
int noupdate;
|
||||
int sizecheck;
|
||||
unsigned char magic[2];
|
||||
int magiccheck;
|
||||
int magicerror;
|
||||
|
||||
|
||||
// display program header
|
||||
@ -735,7 +739,8 @@ int main(int argc, char *argv[]) {
|
||||
help = 0;
|
||||
onlybin = 0;
|
||||
havezip = 0;
|
||||
while ((option = getopt(argc, argv, ":hbzf:v")) != -1) {
|
||||
ignoremagic = 0;
|
||||
while ((option = getopt(argc, argv, "hbzif:v")) != -1) {
|
||||
switch(option) {
|
||||
case 'h':
|
||||
help = 1;
|
||||
@ -746,6 +751,9 @@ int main(int argc, char *argv[]) {
|
||||
case 'z':
|
||||
havezip = 1;
|
||||
break;
|
||||
case 'i':
|
||||
ignoremagic = 1;
|
||||
break;
|
||||
case 'f':
|
||||
sizecheck = sscanf(optarg, "%i", &i);
|
||||
if (sizecheck != 1) {
|
||||
@ -850,11 +858,12 @@ int main(int argc, char *argv[]) {
|
||||
printf("This program creates Linksys style images for the WRT350Nv2 router.\n");
|
||||
}
|
||||
printf(" Usage:\n\
|
||||
%s [-h] [-b] [-z] [-f <version>] [-v] <parameter or zip file> [<image file>]\n\n\
|
||||
%s [-h] [-b] [-z] [-i] [-f <version>] [-v] <parameter or zip file> [<image file>]\n\n\
|
||||
Options:\n\
|
||||
-h - Show this help\n\
|
||||
-b - Create only bin file, no img or zip file is created\n\
|
||||
-z - Have zip file, the img file will be directly created from it\n\
|
||||
-i - Ignore unknown magic numbers\n\
|
||||
-f <version> - Wanted firmware version to use with -z\n\
|
||||
Default firmware version is 0x2020 = 2.00.20.\n\
|
||||
Note: version from parameter file will supersede this\n\
|
||||
@ -929,16 +938,14 @@ int main(int argc, char *argv[]) {
|
||||
mandatory = 0;
|
||||
noupdate = 0;
|
||||
sizecheck = 0;
|
||||
magic[0] = 0;
|
||||
magic[1] = 0;
|
||||
magiccheck = 0;
|
||||
|
||||
switch (i) {
|
||||
case 1:
|
||||
mtd = &mtd_kernel;
|
||||
mandatory = 1;
|
||||
sizecheck = mtd_kernel.size - 16;
|
||||
magic[0] = 0x27;
|
||||
magic[1] = 0x05;
|
||||
magiccheck = 1;
|
||||
break;
|
||||
case 2:
|
||||
mtd = &mtd_rootfs;
|
||||
@ -946,8 +953,7 @@ int main(int argc, char *argv[]) {
|
||||
mtd->size = ROOTFS_END_OFFSET - mtd_kernel.size;
|
||||
mandatory = 1;
|
||||
sizecheck = PRODUCT_ID_OFFSET - mtd_kernel.size;
|
||||
magic[0] = 0x68;
|
||||
magic[1] = 0x73;
|
||||
magiccheck = 1;
|
||||
break;
|
||||
case 3:
|
||||
mtd = &mtd_uboot;
|
||||
@ -973,7 +979,7 @@ int main(int argc, char *argv[]) {
|
||||
printf("mtd %s not specified correctly or at all in parameter file\n", mtd->name);
|
||||
}
|
||||
|
||||
// end checks if no file data present
|
||||
// no further checks if no file data present
|
||||
if (!mtd->filename) {
|
||||
continue;
|
||||
}
|
||||
@ -984,10 +990,36 @@ int main(int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
// general magic number check
|
||||
if (magic[0]) {
|
||||
if ((mtd->magic[0] != magic[0]) || (mtd->magic[1] != magic[1])) {
|
||||
magicerror = 0;
|
||||
if (magiccheck) {
|
||||
switch (i) {
|
||||
case 1: // kernel
|
||||
if (!(
|
||||
((mtd->magic[0] == 0x27) && (mtd->magic[1] == 0x05)) // uImage
|
||||
)) {
|
||||
magicerror = 1;
|
||||
}
|
||||
break;
|
||||
case 2: // rootfs
|
||||
if (!(
|
||||
((mtd->magic[0] == 0x68) && (mtd->magic[1] == 0x73)) // squashfs
|
||||
|| ((mtd->magic[0] == 0x85) && (mtd->magic[1] == 0x19)) // jffs
|
||||
)) {
|
||||
magicerror = 1;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
magicerror = 1;
|
||||
break;
|
||||
}
|
||||
if (magicerror) {
|
||||
printf("mtd %s input file %s has unknown magic number (0x%02X%02X)", mtd->name, mtd->filename, mtd->magic[0], mtd->magic[1]);
|
||||
if (ignoremagic) {
|
||||
printf("...ignoring");
|
||||
} else {
|
||||
exitcode = 1;
|
||||
printf("mtd %s input file %s has wrong magic number (0x%02X%02X)\n", mtd->name, mtd->filename, mtd->magic[0], mtd->magic[1]);
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user