Merge branch 'scb9328' into next
This commit is contained in:
commit
8a97bb978c
|
@ -1,3 +0,0 @@
|
||||||
|
|
||||||
echo running init
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ static int scb9328_devices_init(void) {
|
||||||
register_device(&sdram_dev);
|
register_device(&sdram_dev);
|
||||||
register_device(&dm9000_dev);
|
register_device(&dm9000_dev);
|
||||||
|
|
||||||
devfs_add_partition("nor0", 0x00000, 0x20000, PARTITION_FIXED, "self0");
|
devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self0");
|
||||||
devfs_add_partition("nor0", 0x40000, 0x20000, PARTITION_FIXED, "env0");
|
devfs_add_partition("nor0", 0x40000, 0x20000, PARTITION_FIXED, "env0");
|
||||||
protect_file("/dev/env0", 1);
|
protect_file("/dev/env0", 1);
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,24 @@
|
||||||
CONFIG_ARCH_IMX=y
|
CONFIG_ARCH_IMX=y
|
||||||
CONFIG_MACH_SCB9328=y
|
CONFIG_MACH_SCB9328=y
|
||||||
|
CONFIG_AEABI=y
|
||||||
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
|
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
|
||||||
CONFIG_LONGHELP=y
|
CONFIG_LONGHELP=y
|
||||||
|
CONFIG_GLOB=y
|
||||||
|
CONFIG_HUSH_FANCY_PROMPT=y
|
||||||
CONFIG_CMDLINE_EDITING=y
|
CONFIG_CMDLINE_EDITING=y
|
||||||
CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/scb9328/env"
|
CONFIG_AUTO_COMPLETE=y
|
||||||
|
CONFIG_PARTITION=y
|
||||||
|
CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
|
||||||
|
CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/scb9328/env/"
|
||||||
|
CONFIG_POLLER=y
|
||||||
CONFIG_CMD_EDIT=y
|
CONFIG_CMD_EDIT=y
|
||||||
CONFIG_CMD_SLEEP=y
|
CONFIG_CMD_SLEEP=y
|
||||||
|
CONFIG_CMD_SAVEENV=y
|
||||||
|
CONFIG_CMD_LOADENV=y
|
||||||
|
CONFIG_CMD_EXPORT=y
|
||||||
|
CONFIG_CMD_PRINTENV=y
|
||||||
|
CONFIG_CMD_READLINE=y
|
||||||
|
CONFIG_CMD_ECHO_E=y
|
||||||
CONFIG_CMD_MEMINFO=y
|
CONFIG_CMD_MEMINFO=y
|
||||||
CONFIG_CMD_FLASH=y
|
CONFIG_CMD_FLASH=y
|
||||||
CONFIG_CMD_RESET=y
|
CONFIG_CMD_RESET=y
|
||||||
|
@ -13,10 +26,23 @@ CONFIG_CMD_GO=y
|
||||||
CONFIG_CMD_TIMEOUT=y
|
CONFIG_CMD_TIMEOUT=y
|
||||||
CONFIG_CMD_PARTITION=y
|
CONFIG_CMD_PARTITION=y
|
||||||
CONFIG_CMD_GPIO=y
|
CONFIG_CMD_GPIO=y
|
||||||
|
CONFIG_CMD_UNLZO=y
|
||||||
|
CONFIG_CMD_LED=y
|
||||||
|
CONFIG_CMD_LED_TRIGGER=y
|
||||||
CONFIG_NET=y
|
CONFIG_NET=y
|
||||||
CONFIG_NET_DHCP=y
|
CONFIG_NET_DHCP=y
|
||||||
|
CONFIG_NET_NFS=y
|
||||||
CONFIG_NET_PING=y
|
CONFIG_NET_PING=y
|
||||||
CONFIG_NET_TFTP=y
|
CONFIG_NET_TFTP=y
|
||||||
|
CONFIG_NET_TFTP_PUSH=y
|
||||||
|
CONFIG_NET_NETCONSOLE=y
|
||||||
|
CONFIG_NET_RESOLV=y
|
||||||
CONFIG_DRIVER_NET_DM9000=y
|
CONFIG_DRIVER_NET_DM9000=y
|
||||||
CONFIG_DRIVER_CFI=y
|
CONFIG_DRIVER_CFI=y
|
||||||
|
# CONFIG_DRIVER_CFI_BANK_WIDTH_4 is not set
|
||||||
CONFIG_CFI_BUFFER_WRITE=y
|
CONFIG_CFI_BUFFER_WRITE=y
|
||||||
|
CONFIG_MTD=y
|
||||||
|
CONFIG_UBI=y
|
||||||
|
CONFIG_LED=y
|
||||||
|
CONFIG_LED_GPIO=y
|
||||||
|
CONFIG_LED_TRIGGERS=y
|
||||||
|
|
|
@ -201,7 +201,7 @@ int ehci_omap_init(struct omap_hcd *omap)
|
||||||
v &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS;
|
v &= ~OMAP_UHH_HOSTCONFIG_P3_CONNECT_STATUS;
|
||||||
|
|
||||||
/* Bypass the TLL module for PHY mode operation */
|
/* Bypass the TLL module for PHY mode operation */
|
||||||
if (get_cpu_rev() <= CPU_ES2P1) {
|
if (get_cpu_rev() <= OMAP34XX_ES2_1) {
|
||||||
if ((omap->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) ||
|
if ((omap->port_mode[0] == EHCI_HCD_OMAP_MODE_PHY) ||
|
||||||
(omap->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY) ||
|
(omap->port_mode[1] == EHCI_HCD_OMAP_MODE_PHY) ||
|
||||||
(omap->port_mode[2] == EHCI_HCD_OMAP_MODE_PHY))
|
(omap->port_mode[2] == EHCI_HCD_OMAP_MODE_PHY))
|
||||||
|
|
Loading…
Reference in New Issue