mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
Merge branch 'backfire' into xburst
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
--- a/drivers/ssb/driver_pcicore.c
|
||||
+++ b/drivers/ssb/driver_pcicore.c
|
||||
@@ -399,7 +399,7 @@ static void ssb_pcicore_init_hostmode(st
|
||||
set_io_port_base(ssb_pcicore_controller.io_map_base);
|
||||
/* Give some time to the PCI controller to configure itself with the new
|
||||
* values. Not waiting at this point causes crashes of the machine. */
|
||||
- mdelay(10);
|
||||
+ mdelay(300);
|
||||
register_pci_controller(&ssb_pcicore_controller);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/drivers/ssb/driver_pcicore.c
|
||||
+++ b/drivers/ssb/driver_pcicore.c
|
||||
@@ -370,7 +370,7 @@ static void ssb_pcicore_init_hostmode(st
|
||||
set_io_port_base(ssb_pcicore_controller.io_map_base);
|
||||
/* Give some time to the PCI controller to configure itself with the new
|
||||
* values. Not waiting at this point causes crashes of the machine. */
|
||||
- mdelay(10);
|
||||
+ mdelay(300);
|
||||
register_pci_controller(&ssb_pcicore_controller);
|
||||
}
|
||||
|
||||
@@ -79,13 +79,24 @@ define Image/Build/Linksys
|
||||
endef
|
||||
|
||||
define Image/Build/Freecom
|
||||
# Orion Freecom Images
|
||||
# backup unwanted files
|
||||
rm -rf ${TMP_DIR}/$2_backup
|
||||
mkdir ${TMP_DIR}/$2_backup
|
||||
-mv $(TARGET_DIR)/{var,jffs,rom} ${TMP_DIR}/$2_backup
|
||||
# add extra files
|
||||
$(INSTALL_DIR) $(TARGET_DIR)/boot
|
||||
# TODO: Add special CMDLINE shim for webupgrade image here
|
||||
$(CP) $(KDIR)/dt2-uImage $(TARGET_DIR)/boot/uImage
|
||||
rm -rf $(TARGET_DIR)/{var,jffs,rom}
|
||||
$(INSTALL_DIR) $(TARGET_DIR)/var
|
||||
# create image
|
||||
$(TAR) cfj $(BIN_DIR)/openwrt-$(2)-$(1).img --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
|
||||
$(STAGING_DIR_HOST)/bin/encode_crc $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img $(3)
|
||||
# remove extra files
|
||||
rm -rf $(TARGET_DIR)/{boot,var}
|
||||
# recover unwanted files
|
||||
-mv ${TMP_DIR}/$2_backup/* $(TARGET_DIR)/
|
||||
rm -rf ${TMP_DIR}/$2_backup
|
||||
endef
|
||||
|
||||
define Image/Build
|
||||
|
||||
@@ -44,6 +44,7 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
|
||||
# CONFIG_CMDLINE_BOOL is not set
|
||||
CONFIG_COMPAT_VDSO=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
# CONFIG_CPA_DEBUG is not set
|
||||
# CONFIG_CPU5_WDT is not set
|
||||
CONFIG_CPU_FREQ=y
|
||||
# CONFIG_CPU_FREQ_DEBUG is not set
|
||||
@@ -71,7 +72,13 @@ CONFIG_CPU_IDLE_GOV_LADDER=y
|
||||
# CONFIG_CS5535_GPIO is not set
|
||||
# CONFIG_CS89x0 is not set
|
||||
# CONFIG_DCDBAS is not set
|
||||
# CONFIG_DEBUG_BOOT_PARAMS is not set
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
# CONFIG_DEBUG_NX_TEST is not set
|
||||
# CONFIG_DEBUG_PAGEALLOC is not set
|
||||
# CONFIG_DEBUG_RODATA is not set
|
||||
# CONFIG_DEBUG_STACKOVERFLOW is not set
|
||||
# CONFIG_DEBUG_VIRTUAL is not set
|
||||
CONFIG_DECOMPRESS_BZIP2=y
|
||||
CONFIG_DECOMPRESS_GZIP=y
|
||||
CONFIG_DECOMPRESS_LZMA=y
|
||||
@@ -202,6 +209,7 @@ CONFIG_KEYBOARD_ATKBD=y
|
||||
# CONFIG_KEYBOARD_STOWAWAY is not set
|
||||
# CONFIG_KEYBOARD_SUNKBD is not set
|
||||
# CONFIG_KEYBOARD_XTKBD is not set
|
||||
# CONFIG_KMEMCHECK is not set
|
||||
CONFIG_KTIME_SCALAR=y
|
||||
# CONFIG_LANCE is not set
|
||||
# CONFIG_LEDS_ALIX2 is not set
|
||||
@@ -406,6 +414,7 @@ CONFIG_X86_POPAD_OK=y
|
||||
# CONFIG_X86_POWERNOW_K7 is not set
|
||||
# CONFIG_X86_POWERNOW_K8 is not set
|
||||
CONFIG_X86_PPRO_FENCE=y
|
||||
# CONFIG_X86_PTDUMP is not set
|
||||
# CONFIG_X86_REBOOTFIXUPS is not set
|
||||
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
|
||||
CONFIG_X86_RESERVE_LOW_64K=y
|
||||
|
||||
Reference in New Issue
Block a user