Changeset 12136


Ignore:
Timestamp:
2008-08-05T15:42:36+02:00 (8 years ago)
Author:
florian
Message:

Reinstate rdc bootability and force it to use init=/etc/preinit, thus the remove the hackish SetInitramfs actions

Location:
trunk
Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/modules/network.mk

    r11942 r12136  
    559559  KCONFIG:=CONFIG_R6040 
    560560  FILES:=$(LINUX_DIR)/drivers/net/r6040.$(LINUX_KMOD_SUFFIX) 
     561  AUTOLOAD:=$(call AutoLoad,99,r6040) 
    561562endef 
    562563 
  • trunk/target/linux/rdc/Makefile

    r11747 r12136  
    2121endef 
    2222 
    23 ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) 
    24   define Kernel/SetInitramfs 
    25         echo "r6040 parent=wlan0" > $(TARGET_DIR)/etc/modules.d/99-r6040 
    26         $(RM) $(TARGET_DIR)/sbin/init 
    27         ln -s /etc/preinit $(TARGET_DIR)/sbin/init 
    28         sed -i 's,exec /sbin/init,exec /bin/busybox init,g' $(TARGET_DIR)/etc/preinit 
    29         sed -i 's,/sbin/init,/bin/busybox init,g' $(TARGET_DIR)/init 
    30         mv $(TARGET_DIR)/init $(TARGET_DIR)/linuxrc 
    31         sed -i 's,eth0,eth1,g' $(TARGET_DIR)/etc/config/network 
    32   endef 
    33 endif 
    34  
    3523$(eval $(call BuildTarget)) 
  • trunk/target/linux/rdc/config-2.6.24

    r11097 r12136  
    2424CONFIG_BLK_DEV_IDEDISK=m 
    2525# CONFIG_BLK_DEV_IDEDMA is not set 
    26 # CONFIG_BLK_DEV_PLATFORM is not set 
     26CONFIG_BLK_DEV_RAM=y 
     27CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 
     28CONFIG_BLK_DEV_RAM_COUNT=16 
     29CONFIG_BLK_DEV_RAM_SIZE=4096 
    2730CONFIG_BOUNCE=y 
    2831# CONFIG_BROADCOM_PHY is not set 
    29 # CONFIG_BT_HCIUART_LL is not set 
    3032CONFIG_CLOCKSOURCE_WATCHDOG=y 
    3133# CONFIG_COMPAT_VDSO is not set 
     
    7173CONFIG_HIBERNATION_UP_POSSIBLE=y 
    7274CONFIG_HID=m 
    73 # CONFIG_HIDRAW is not set 
    7475CONFIG_HID_SUPPORT=y 
    7576# CONFIG_HIGHMEM4G is not set 
     
    108109CONFIG_INITRAMFS_SOURCE="" 
    109110CONFIG_INPUT=m 
     111# CONFIG_INPUT_GPIO_BUTTONS is not set 
    110112CONFIG_INPUT_MISC=y 
    111113CONFIG_INPUT_YEALINK=m 
     
    122124# CONFIG_KVM is not set 
    123125CONFIG_LBD=y 
    124 # CONFIG_LEDS_ALIX is not set 
    125126CONFIG_LEDS_GPIO=y 
    126127# CONFIG_LGUEST is not set 
     
    217218CONFIG_NLS_ISO8859_2=m 
    218219CONFIG_NOHIGHMEM=y 
    219 # CONFIG_NO_HZ is not set 
     220CONFIG_NO_HZ=y 
    220221CONFIG_NR_QUICK=1 
    221222# CONFIG_NSC_GPIO is not set 
     
    225226CONFIG_PATA_ARTOP=m 
    226227# CONFIG_PATA_CS5536 is not set 
    227 # CONFIG_PATA_NS87415 is not set 
    228228# CONFIG_PC8736x_GPIO is not set 
    229229# CONFIG_PC87413_WDT is not set 
    230230CONFIG_PCCARD=m 
    231231CONFIG_PCCARD_NONSTATIC=m 
     232CONFIG_PCI=y 
    232233# CONFIG_PCIEPORTBUS is not set 
    233234# CONFIG_PCIPCWATCHDOG is not set 
    234 CONFIG_PCI=y 
    235235CONFIG_PCI_BIOS=y 
    236236CONFIG_PCI_DIRECT=y 
     
    258258# CONFIG_SC520_WDT is not set 
    259259CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 
    260 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set 
    261260# CONFIG_SCSI_MULTI_LUN is not set 
    262261CONFIG_SCSI_WAIT_SCAN=m 
     
    264263# CONFIG_SCx200_ACB is not set 
    265264CONFIG_SEMAPHORE_SLEEPERS=y 
    266 # CONFIG_SENSORS_FSCHMD is not set 
    267265# CONFIG_SERIAL_8250_EXTENDED is not set 
    268266CONFIG_SLABINFO=y 
     
    270268# CONFIG_SMSC37B787_WDT is not set 
    271269# CONFIG_SMSC_PHY is not set 
    272 # CONFIG_SND_CS5530 is not set 
    273270CONFIG_SOFT_WATCHDOG=m 
    274271# CONFIG_SONYPI is not set 
     
    278275CONFIG_SYSVIPC_SYSCTL=y 
    279276# CONFIG_TELCLOCK is not set 
    280 # CONFIG_TICK_ONESHOT is not set 
     277CONFIG_TICK_ONESHOT=y 
    281278# CONFIG_TOSHIBA is not set 
    282279CONFIG_UID16=y 
     280CONFIG_USB=m 
    283281# CONFIG_USBPCWATCHDOG is not set 
    284 CONFIG_USB=m 
    285282CONFIG_USB_EHCI_HCD=m 
    286283# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 
     
    289286CONFIG_USB_PWC=m 
    290287# CONFIG_USB_PWC_DEBUG is not set 
    291 # CONFIG_USB_R8A66597_HCD is not set 
    292288# CONFIG_USB_SERIAL_CH341 is not set 
    293289# CONFIG_USB_SERIAL_OTI6858 is not set 
     
    299295CONFIG_VIDEO_CAPTURE_DRIVERS=y 
    300296CONFIG_VIDEO_CPIA2=m 
    301 # CONFIG_VIDEO_TCM825X is not set 
    302297CONFIG_VIDEO_V4L1=y 
    303 # CONFIG_VIDEO_VP27SMPX is not set 
    304298CONFIG_VIRTUALIZATION=y 
    305299# CONFIG_VM86 is not set 
  • trunk/target/linux/rdc/files/drivers/net/r6040.c

    r11508 r12136  
    244244 
    245245struct net_device *parent_dev; 
    246 static char *parent; 
     246static char *parent = "wlan0"; 
    247247module_param(parent, charp, 0444); 
    248248MODULE_PARM_DESC(parent, "Parent network device name to get the MAC address from"); 
Note: See TracChangeset for help on using the changeset viewer.