Hello Mike, 2009/1/2 Mike Frysinger <vap...@gentoo.org>: > Rather than forcing people to define a custom "LITTLEENDIAN", just use the > __LITTLE_ENDIAN one from the Linux byteorder headers that every arch is > already setting up. > > Signed-off-by: Mike Frysinger <vap...@gentoo.org> > --- > v1 > - convert more usb LITTLEENDIAN users
I applied this patch to the u-boot-usb 'testing' branch. When it compiles properly and no regressions are being detected, I move it to the 'next' branch for the next U-boot release. Thanks. Remy > > common/usb_storage.c | 2 -- > cpu/arm920t/s3c24x0/usb_ohci.c | 4 +--- > cpu/mips/au1x00_usb_ohci.c | 6 ++---- > include/configs/VCMA9.h | 1 - > include/configs/afeb9260.h | 1 - > include/configs/at91cap9adk.h | 1 - > include/configs/at91sam9260ek.h | 1 - > include/configs/at91sam9261ek.h | 1 - > include/configs/at91sam9263ek.h | 1 - > include/configs/delta.h | 2 -- > include/configs/mp2usb.h | 1 - > include/configs/sh7785lcr.h | 1 - > include/configs/smdk6400.h | 1 - > include/configs/trab.h | 1 - > include/configs/trizepsiv.h | 2 -- > include/usb.h | 4 ++-- > 16 files changed, 5 insertions(+), 25 deletions(-) > > diff --git a/common/usb_storage.c b/common/usb_storage.c > index 94f659f..bb468aa 100644 > --- a/common/usb_storage.c > +++ b/common/usb_storage.c > @@ -45,8 +45,6 @@ > * New Note: > * Support for USB Mass Storage Devices (BBB) has been added. It has > * only been tested with USB memory sticks. > - * Nota bene: if you are using the BBB support with a little-endian > - * CPU then you MUST define LITTLEENDIAN in the configuration file! > */ > > > diff --git a/cpu/arm920t/s3c24x0/usb_ohci.c b/cpu/arm920t/s3c24x0/usb_ohci.c > index 641f270..9cbd477 100644 > --- a/cpu/arm920t/s3c24x0/usb_ohci.c > +++ b/cpu/arm920t/s3c24x0/usb_ohci.c > @@ -29,9 +29,7 @@ > */ > /* > * IMPORTANT NOTES > - * 1 - you MUST define LITTLEENDIAN in the configuration file for the > - * board or this driver will NOT work! > - * 2 - this driver is intended for use with USB Mass Storage Devices > + * 1 - this driver is intended for use with USB Mass Storage Devices > * (BBB) ONLY. There is NO support for Interrupt or Isochronous pipes! > */ > > diff --git a/cpu/mips/au1x00_usb_ohci.c b/cpu/mips/au1x00_usb_ohci.c > index 17489da..ea02efb 100644 > --- a/cpu/mips/au1x00_usb_ohci.c > +++ b/cpu/mips/au1x00_usb_ohci.c > @@ -27,9 +27,7 @@ > */ > /* > * IMPORTANT NOTES > - * 1 - you MUST define LITTLEENDIAN in the configuration file for the > - * board or this driver will NOT work! > - * 2 - this driver is intended for use with USB Mass Storage Devices > + * 1 - this driver is intended for use with USB Mass Storage Devices > * (BBB) ONLY. There is NO support for Interrupt or Isochronous pipes! > */ > > @@ -56,7 +54,7 @@ > #define USBH_ENABLE_CE (1<<3) > #define USBH_ENABLE_RD (1<<4) > > -#ifdef LITTLEENDIAN > +#ifdef __LITTLE_ENDIAN > #define USBH_ENABLE_INIT (USBH_ENABLE_CE | USBH_ENABLE_E | USBH_ENABLE_C) > #else > #define USBH_ENABLE_INIT (USBH_ENABLE_CE | USBH_ENABLE_E | USBH_ENABLE_C | > USBH_ENABLE_BE) > diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h > index 0bc2f68..a65013c 100644 > --- a/include/configs/VCMA9.h > +++ b/include/configs/VCMA9.h > @@ -36,7 +36,6 @@ > #define CONFIG_ARM920T 1 /* This is an ARM920T Core */ > #define CONFIG_S3C2410 1 /* in a SAMSUNG S3C2410 SoC > */ > #define CONFIG_VCMA9 1 /* on a MPL VCMA9 Board */ > -#define LITTLEENDIAN 1 /* used by usb_ohci.c */ > > /* input clock of PLL */ > #define CONFIG_SYS_CLK_FREQ 12000000/* VCMA9 has 12MHz input clock */ > diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h > index d63a1a0..33ad66b 100644 > --- a/include/configs/afeb9260.h > +++ b/include/configs/afeb9260.h > @@ -115,7 +115,6 @@ > > /* USB */ > #define CONFIG_USB_OHCI_NEW 1 > -#define LITTLEENDIAN 1 > #define CONFIG_DOS_PARTITION 1 > #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 > #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* > AT91SAM9260_UHP_BASE */ > diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h > index b2baf1b..c232f61 100644 > --- a/include/configs/at91cap9adk.h > +++ b/include/configs/at91cap9adk.h > @@ -132,7 +132,6 @@ > > /* USB */ > #define CONFIG_USB_OHCI_NEW 1 > -#define LITTLEENDIAN 1 > #define CONFIG_DOS_PARTITION 1 > #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 > #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00700000 /* > AT91_BASE_UHP */ > diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h > index 1538929..c59cf39 100644 > --- a/include/configs/at91sam9260ek.h > +++ b/include/configs/at91sam9260ek.h > @@ -117,7 +117,6 @@ > > /* USB */ > #define CONFIG_USB_OHCI_NEW 1 > -#define LITTLEENDIAN 1 > #define CONFIG_DOS_PARTITION 1 > #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 > #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* > AT91SAM9260_UHP_BASE */ > diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h > index 0016b4f..082fd45 100644 > --- a/include/configs/at91sam9261ek.h > +++ b/include/configs/at91sam9261ek.h > @@ -130,7 +130,6 @@ > > /* USB */ > #define CONFIG_USB_OHCI_NEW 1 > -#define LITTLEENDIAN 1 > #define CONFIG_DOS_PARTITION 1 > #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 > #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* > AT91SAM9261_UHP_BASE */ > diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h > index d9ebc87..b478acf 100644 > --- a/include/configs/at91sam9263ek.h > +++ b/include/configs/at91sam9263ek.h > @@ -137,7 +137,6 @@ > > /* USB */ > #define CONFIG_USB_OHCI_NEW 1 > -#define LITTLEENDIAN 1 > #define CONFIG_DOS_PARTITION 1 > #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 > #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00a00000 /* > AT91SAM9263_UHP_BASE */ > diff --git a/include/configs/delta.h b/include/configs/delta.h > index 08b28ca..e63dca3 100644 > --- a/include/configs/delta.h > +++ b/include/configs/delta.h > @@ -131,8 +131,6 @@ > #define CONFIG_SYS_USB_OHCI_SLOT_NAME "delta" > #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 3 > > -#define LITTLEENDIAN 1 /* used by usb_ohci.c */ > - > #define CONFIG_BOOTDELAY -1 > #define CONFIG_ETHADDR 08:00:3e:26:0a:5b > #define CONFIG_NETMASK 255.255.0.0 > diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h > index cbbdb0c..d8b6414 100644 > --- a/include/configs/mp2usb.h > +++ b/include/configs/mp2usb.h > @@ -216,7 +216,6 @@ > #define CONFIG_SYS_PBSIZE > (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */ > > #define CONFIG_SYS_DEVICE_DEREGISTER /* needs device_deregister */ > -#define LITTLEENDIAN 1 /* used by usb_ohci.c */ > > #define CONFIG_SYS_HZ 1000 > #define CONFIG_SYS_HZ_CLOCK (AT91C_MASTER_CLOCK/2) /* AT91C_TC0_CMR is > implicitly set to */ > diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h > index 1b59059..ebca448 100644 > --- a/include/configs/sh7785lcr.h > +++ b/include/configs/sh7785lcr.h > @@ -123,7 +123,6 @@ > #undef CONFIG_SYS_DIRECT_FLASH_TFTP > > /* R8A66597 */ > -#define LITTLEENDIAN /* for include/usb.h */ > #define CONFIG_USB_R8A66597_HCD > #define CONFIG_R8A66597_BASE_ADDR SH7785LCR_USB_BASE > #define CONFIG_R8A66597_XTAL 0x0000 /* 12MHz */ > diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h > index 1784cc6..d7ecbf6 100644 > --- a/include/configs/smdk6400.h > +++ b/include/configs/smdk6400.h > @@ -294,7 +294,6 @@ > #define CONFIG_SYS_USB_OHCI_SLOT_NAME "s3c6400" > #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 3 > #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 > -#define LITTLEENDIAN 1 /* used by usb_ohci.c */ > > #define CONFIG_USB_STORAGE 1 > #endif > diff --git a/include/configs/trab.h b/include/configs/trab.h > index 562cd60..0a7a73d 100644 > --- a/include/configs/trab.h > +++ b/include/configs/trab.h > @@ -44,7 +44,6 @@ > #define CONFIG_S3C2400 1 /* in a SAMSUNG S3C2400 SoC */ > #define CONFIG_TRAB 1 /* on a TRAB Board */ > #undef CONFIG_TRAB_50MHZ /* run the CPU at 50 MHz */ > -#define LITTLEENDIAN 1 /* used by usb_ohci.c */ > > /* automatic software updates (see board/trab/auto_update.c) */ > #define CONFIG_AUTO_UPDATE 1 > diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h > index b2065ee..0a8e994 100644 > --- a/include/configs/trizepsiv.h > +++ b/include/configs/trizepsiv.h > @@ -42,8 +42,6 @@ > */ > #define CONFIG_PXA27X 1 /* This is an PXA27x CPU */ > > -#define LITTLEENDIAN 1 /* used by usb_ohci.c */ > - > #define CONFIG_MMC 1 > #define BOARD_LATE_INIT 1 > > diff --git a/include/usb.h b/include/usb.h > index 510df95..befb201 100644 > --- a/include/usb.h > +++ b/include/usb.h > @@ -263,13 +263,13 @@ int usb_set_interface(struct usb_device *dev, int > interface, int alternate); > ((x_ & 0xFF000000UL) >> 24)); \ > }) > > -#ifdef LITTLEENDIAN > +#ifdef __LITTLE_ENDIAN > # define swap_16(x) (x) > # define swap_32(x) (x) > #else > # define swap_16(x) __swap_16(x) > # define swap_32(x) __swap_32(x) > -#endif /* LITTLEENDIAN */ > +#endif > > /* > * Calling this entity a "pipe" is glorifying it. A USB pipe > -- > 1.6.0.6 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
