mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-26 23:41:50 +00:00
Coding Style cleanup
Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
parent
57ff9f2421
commit
071bc92330
32 changed files with 117 additions and 162 deletions
|
@ -93,4 +93,3 @@ void dram_init_banksize(void)
|
||||||
dram_init();
|
dram_init();
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_SYS_BOARD_DRAM_INIT */
|
#endif /* CONFIG_SYS_BOARD_DRAM_INIT */
|
||||||
|
|
||||||
|
|
|
@ -312,7 +312,7 @@ void pxa_wakeup(void)
|
||||||
int arch_cpu_init(void)
|
int arch_cpu_init(void)
|
||||||
{
|
{
|
||||||
pxa_gpio_setup();
|
pxa_gpio_setup();
|
||||||
// pxa_wait_ticks(0x8000);
|
/* pxa_wait_ticks(0x8000); */
|
||||||
pxa_wakeup();
|
pxa_wakeup();
|
||||||
pxa_interrupt_setup();
|
pxa_interrupt_setup();
|
||||||
pxa_clock_setup();
|
pxa_clock_setup();
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
int do_cled(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
int do_cled(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
||||||
{
|
{
|
||||||
ulong addr = 0x20000000 + 0x200000; // AMS2
|
ulong addr = 0x20000000 + 0x200000; /* AMS2 */
|
||||||
uchar data;
|
uchar data;
|
||||||
|
|
||||||
if (argc < 2)
|
if (argc < 2)
|
||||||
|
|
|
@ -92,4 +92,3 @@ int qong_fpga_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -31,4 +31,3 @@
|
||||||
|
|
||||||
# For use with external or internal boots.
|
# For use with external or internal boots.
|
||||||
TEXT_BASE = 0x80008000
|
TEXT_BASE = 0x80008000
|
||||||
|
|
||||||
|
|
|
@ -58,5 +58,3 @@ uint get_board_derivative(void)
|
||||||
*/
|
*/
|
||||||
return gur->gpporcr >> 28;
|
return gur->gpporcr >> 28;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -162,4 +162,3 @@ void fsl_ddr_board_options(memctl_options_t *popts,
|
||||||
popts->rtt_override = 1;
|
popts->rtt_override = 1;
|
||||||
popts->rtt_override_value = 3;
|
popts->rtt_override_value = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -395,5 +395,3 @@ int lattice_info(Lattice_desc *desc)
|
||||||
|
|
||||||
return ret_val;
|
return ret_val;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -412,4 +412,3 @@ int omap_mmc_init(int dev_index)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ typedef struct atmel_usart3 {
|
||||||
u32 reserved1;
|
u32 reserved1;
|
||||||
u32 ifr;
|
u32 ifr;
|
||||||
u32 man;
|
u32 man;
|
||||||
u32 reserved2[54]; // version and PDC not needed
|
u32 reserved2[54]; /* version and PDC not needed */
|
||||||
} atmel_usart3_t;
|
} atmel_usart3_t;
|
||||||
|
|
||||||
/* Bitfields in CR */
|
/* Bitfields in CR */
|
||||||
|
|
|
@ -116,4 +116,3 @@ int usb_gadget_config_buf(
|
||||||
cp->bmAttributes |= USB_CONFIG_ATT_ONE;
|
cp->bmAttributes |= USB_CONFIG_ATT_ONE;
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -302,4 +302,3 @@ void usb_ep_autoconfig_reset(struct usb_gadget *gadget)
|
||||||
#endif
|
#endif
|
||||||
epnum = 0;
|
epnum = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1968,4 +1968,3 @@ fail:
|
||||||
error("%s failed. error = %d", __func__, status);
|
error("%s failed. error = %d", __func__, status);
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -137,4 +137,3 @@ usb_gadget_get_string(struct usb_gadget_strings *table, int id, u8 *buf)
|
||||||
buf[1] = USB_DT_STRING;
|
buf[1] = USB_DT_STRING;
|
||||||
return buf[0];
|
return buf[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -60,8 +60,6 @@
|
||||||
|
|
||||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
|
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* CS8900 Ethernet drivers
|
* CS8900 Ethernet drivers
|
||||||
*/
|
*/
|
||||||
|
@ -79,7 +77,6 @@
|
||||||
|
|
||||||
#define CONFIG_BAUDRATE 115200
|
#define CONFIG_BAUDRATE 115200
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* BOOTP options
|
* BOOTP options
|
||||||
*/
|
*/
|
||||||
|
@ -88,7 +85,6 @@
|
||||||
#define CONFIG_BOOTP_GATEWAY
|
#define CONFIG_BOOTP_GATEWAY
|
||||||
#define CONFIG_BOOTP_HOSTNAME
|
#define CONFIG_BOOTP_HOSTNAME
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Command line configuration.
|
* Command line configuration.
|
||||||
*/
|
*/
|
||||||
|
@ -98,7 +94,6 @@
|
||||||
#define CONFIG_CMD_REGINFO
|
#define CONFIG_CMD_REGINFO
|
||||||
#define CONFIG_CMD_ELF
|
#define CONFIG_CMD_ELF
|
||||||
|
|
||||||
|
|
||||||
#define CONFIG_BOOTDELAY 3
|
#define CONFIG_BOOTDELAY 3
|
||||||
#define CONFIG_BOOTARGS "root=/dev/msdk mem=48M"
|
#define CONFIG_BOOTARGS "root=/dev/msdk mem=48M"
|
||||||
#define CONFIG_BOOTFILE "mx1ads"
|
#define CONFIG_BOOTFILE "mx1ads"
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
#undef _CONFIG_UART4 /* internal uart 4 */
|
#undef _CONFIG_UART4 /* internal uart 4 */
|
||||||
#undef CONFIG_SILENT_CONSOLE /* use this to disable output */
|
#undef CONFIG_SILENT_CONSOLE /* use this to disable output */
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* BOOTP options
|
* BOOTP options
|
||||||
*/
|
*/
|
||||||
|
@ -43,7 +42,6 @@
|
||||||
#define CONFIG_BOOTP_GATEWAY
|
#define CONFIG_BOOTP_GATEWAY
|
||||||
#define CONFIG_BOOTP_HOSTNAME
|
#define CONFIG_BOOTP_HOSTNAME
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Command line configuration.
|
* Command line configuration.
|
||||||
*/
|
*/
|
||||||
|
@ -58,7 +56,6 @@
|
||||||
#undef CONFIG_CMD_PING
|
#undef CONFIG_CMD_PING
|
||||||
#undef CONFIG_CMD_SOURCE
|
#undef CONFIG_CMD_SOURCE
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Boot options. Setting delay to -1 stops autostart count down.
|
* Boot options. Setting delay to -1 stops autostart count down.
|
||||||
*/
|
*/
|
||||||
|
@ -98,8 +95,6 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) )
|
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define CONFIG_STACKSIZE (120<<10) /* stack size */
|
#define CONFIG_STACKSIZE (120<<10) /* stack size */
|
||||||
|
|
||||||
#ifdef CONFIG_USE_IRQ
|
#ifdef CONFIG_USE_IRQ
|
||||||
|
|
|
@ -35,7 +35,6 @@
|
||||||
* Select serial console configuration
|
* Select serial console configuration
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* BOOTP options
|
* BOOTP options
|
||||||
*/
|
*/
|
||||||
|
@ -44,7 +43,6 @@
|
||||||
#define CONFIG_BOOTP_GATEWAY
|
#define CONFIG_BOOTP_GATEWAY
|
||||||
#define CONFIG_BOOTP_HOSTNAME
|
#define CONFIG_BOOTP_HOSTNAME
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Command line configuration.
|
* Command line configuration.
|
||||||
*/
|
*/
|
||||||
|
@ -58,7 +56,6 @@
|
||||||
#undef CONFIG_CMD_LOADS
|
#undef CONFIG_CMD_LOADS
|
||||||
#undef CONFIG_CMD_SOURCE
|
#undef CONFIG_CMD_SOURCE
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Boot options. Setting delay to -1 stops autostart count down.
|
* Boot options. Setting delay to -1 stops autostart count down.
|
||||||
* NOTE: Sending parameters to kernel depends on kernel version and
|
* NOTE: Sending parameters to kernel depends on kernel version and
|
||||||
|
@ -100,14 +97,11 @@
|
||||||
#define CONFIG_INITRD_TAG 1 /* send initrd params */
|
#define CONFIG_INITRD_TAG 1 /* send initrd params */
|
||||||
#undef CONFIG_VFD /* do not send framebuffer setup */
|
#undef CONFIG_VFD /* do not send framebuffer setup */
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Malloc pool need to host env + 128 Kb reserve for other allocations.
|
* Malloc pool need to host env + 128 Kb reserve for other allocations.
|
||||||
*/
|
*/
|
||||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) )
|
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128<<10) )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define CONFIG_STACKSIZE (120<<10) /* stack size */
|
#define CONFIG_STACKSIZE (120<<10) /* stack size */
|
||||||
|
|
||||||
#ifdef CONFIG_USE_IRQ
|
#ifdef CONFIG_USE_IRQ
|
||||||
|
@ -133,15 +127,6 @@
|
||||||
#define SCB9328_SDRAM_1 0x08000000 /* SDRAM bank #1 */
|
#define SCB9328_SDRAM_1 0x08000000 /* SDRAM bank #1 */
|
||||||
#define SCB9328_SDRAM_1_SIZE 0x01000000 /* 16 MB */
|
#define SCB9328_SDRAM_1_SIZE 0x01000000 /* 16 MB */
|
||||||
|
|
||||||
/*
|
|
||||||
* Flash Controller settings
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Hardware drivers
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Configuration for FLASH memory for the Synertronixx board
|
* Configuration for FLASH memory for the Synertronixx board
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -317,4 +317,3 @@ void writePort(unsigned char pins, unsigned char value);
|
||||||
unsigned char readPort(void);
|
unsigned char readPort(void);
|
||||||
void sclock(void);
|
void sclock(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -518,14 +518,14 @@ struct fb_info {
|
||||||
#define FBINFO_FLAG_MODULE FBINFO_MODULE
|
#define FBINFO_FLAG_MODULE FBINFO_MODULE
|
||||||
#define FBINFO_FLAG_DEFAULT FBINFO_DEFAULT
|
#define FBINFO_FLAG_DEFAULT FBINFO_DEFAULT
|
||||||
|
|
||||||
// This will go away
|
/* This will go away */
|
||||||
#if defined(__sparc__)
|
#if defined(__sparc__)
|
||||||
|
|
||||||
/* We map all of our framebuffers such that big-endian accesses
|
/* We map all of our framebuffers such that big-endian accesses
|
||||||
* are what we want, so the following is sufficient.
|
* are what we want, so the following is sufficient.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// This will go away
|
/* This will go away */
|
||||||
#define fb_readb sbus_readb
|
#define fb_readb sbus_readb
|
||||||
#define fb_readw sbus_readw
|
#define fb_readw sbus_readw
|
||||||
#define fb_readl sbus_readl
|
#define fb_readl sbus_readl
|
||||||
|
|
|
@ -9,8 +9,6 @@
|
||||||
* Remy Bohmer <linux@bohmer.net>
|
* Remy Bohmer <linux@bohmer.net>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define USB_CDC_SUBCLASS_ACM 0x02
|
#define USB_CDC_SUBCLASS_ACM 0x02
|
||||||
#define USB_CDC_SUBCLASS_ETHERNET 0x06
|
#define USB_CDC_SUBCLASS_ETHERNET 0x06
|
||||||
#define USB_CDC_SUBCLASS_WHCM 0x08
|
#define USB_CDC_SUBCLASS_WHCM 0x08
|
||||||
|
@ -199,7 +197,6 @@ struct usb_cdc_line_coding {
|
||||||
#define USB_CDC_PACKET_TYPE_BROADCAST (1 << 3)
|
#define USB_CDC_PACKET_TYPE_BROADCAST (1 << 3)
|
||||||
#define USB_CDC_PACKET_TYPE_MULTICAST (1 << 4) /* filtered */
|
#define USB_CDC_PACKET_TYPE_MULTICAST (1 << 4) /* filtered */
|
||||||
|
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------*/
|
/*-------------------------------------------------------------------------*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -221,4 +218,3 @@ struct usb_cdc_notification {
|
||||||
__le16 wIndex;
|
__le16 wIndex;
|
||||||
__le16 wLength;
|
__le16 wLength;
|
||||||
} __attribute__ ((packed));
|
} __attribute__ ((packed));
|
||||||
|
|
||||||
|
|
|
@ -227,8 +227,6 @@ static int fpga_mem_test(void)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Verify FPGA addresslines */
|
/* Verify FPGA addresslines */
|
||||||
static int fpga_post_addrline(ulong *address, ulong *base, ulong size)
|
static int fpga_post_addrline(ulong *address, ulong *base, ulong size)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue