brain-hackers_pepepper-mirror
/
u-boot-brain
mirror of https://github.com/brain-hackers/u-boot-brain
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor coding style cleanup. 

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2011-09-11 21:24:09 +02:00
parent 3b71755249
commit 04e5ae7931
10 changed files with 48 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
README
View File

@ -1177,7 +1177,7 @@ The following options need to be configured:
or CONFIG_VIDEO_SED13806_16BPP or CONFIG_VIDEO_SED13806_16BPP
CONFIG_FSL_DIU_FB CONFIG_FSL_DIU_FB
Enable the Freescale DIU video driver. Reference boards for Enable the Freescale DIU video driver. Reference boards for
SOCs that have a DIU should define this macro to enable DIU SOCs that have a DIU should define this macro to enable DIU
support, and should also define these other macros: support, and should also define these other macros:
@ -2289,44 +2289,44 @@ FIT uImage format:
kernel. Needed for UBI support. kernel. Needed for UBI support.
- SPL framework - SPL framework
CONFIG_SPL CONFIG_SPL
Enable building of SPL globally. Enable building of SPL globally.
CONFIG_SPL_TEXT_BASE CONFIG_SPL_TEXT_BASE
TEXT_BASE for linking the SPL binary. TEXT_BASE for linking the SPL binary.
CONFIG_SPL_LDSCRIPT CONFIG_SPL_LDSCRIPT
LDSCRIPT for linking the SPL binary. LDSCRIPT for linking the SPL binary.
CONFIG_SPL_LIBCOMMON_SUPPORT CONFIG_SPL_LIBCOMMON_SUPPORT
Support for common/libcommon.o in SPL binary Support for common/libcommon.o in SPL binary
CONFIG_SPL_LIBDISK_SUPPORT CONFIG_SPL_LIBDISK_SUPPORT
Support for disk/libdisk.o in SPL binary Support for disk/libdisk.o in SPL binary
CONFIG_SPL_I2C_SUPPORT CONFIG_SPL_I2C_SUPPORT
Support for drivers/i2c/libi2c.o in SPL binary Support for drivers/i2c/libi2c.o in SPL binary
CONFIG_SPL_GPIO_SUPPORT CONFIG_SPL_GPIO_SUPPORT
Support for drivers/gpio/libgpio.o in SPL binary Support for drivers/gpio/libgpio.o in SPL binary
CONFIG_SPL_MMC_SUPPORT CONFIG_SPL_MMC_SUPPORT
Support for drivers/mmc/libmmc.o in SPL binary Support for drivers/mmc/libmmc.o in SPL binary
CONFIG_SPL_SERIAL_SUPPORT CONFIG_SPL_SERIAL_SUPPORT
Support for drivers/serial/libserial.o in SPL binary Support for drivers/serial/libserial.o in SPL binary
CONFIG_SPL_SPI_FLASH_SUPPORT CONFIG_SPL_SPI_FLASH_SUPPORT
Support for drivers/mtd/spi/libspi_flash.o in SPL binary Support for drivers/mtd/spi/libspi_flash.o in SPL binary
CONFIG_SPL_SPI_SUPPORT CONFIG_SPL_SPI_SUPPORT
Support for drivers/spi/libspi.o in SPL binary Support for drivers/spi/libspi.o in SPL binary
CONFIG_SPL_FAT_SUPPORT CONFIG_SPL_FAT_SUPPORT
Support for fs/fat/libfat.o in SPL binary Support for fs/fat/libfat.o in SPL binary
CONFIG_SPL_LIBGENERIC_SUPPORT CONFIG_SPL_LIBGENERIC_SUPPORT
Support for lib/libgeneric.o in SPL binary Support for lib/libgeneric.o in SPL binary
Modem Support: Modem Support:
-------------- --------------

2
arch/arm/cpu/arm920t/at91/at91rm9200_devices.c
View File

@ -75,11 +75,9 @@ void at91_serial2_hw_init(void)
writel(1 << ATMEL_ID_USART2, &pmc->pcer); writel(1 << ATMEL_ID_USART2, &pmc->pcer);
} }
void at91_seriald_hw_init(void) void at91_seriald_hw_init(void)
{ {
at91_set_a_periph(AT91_PIO_PORTA, 30, PUP); /* DRXD */ at91_set_a_periph(AT91_PIO_PORTA, 30, PUP); /* DRXD */
at91_set_a_periph(AT91_PIO_PORTA, 31, 1); /* DTXD */ at91_set_a_periph(AT91_PIO_PORTA, 31, 1); /* DTXD */
/* writing SYS to PCER has no effect on AT91RM9200 */ /* writing SYS to PCER has no effect on AT91RM9200 */
} }

2
arch/arm/cpu/arm920t/at91/clock.c
View File

@ -104,7 +104,6 @@ static u32 at91_pll_rate(u32 freq, u32 reg)
return freq; return freq;
} }
int at91_clock_init(unsigned long main_clock) int at91_clock_init(unsigned long main_clock)
{ {
unsigned freq, mckr; unsigned freq, mckr;
@ -157,4 +156,3 @@ int at91_clock_init(unsigned long main_clock)
return 0; return 0;
} }

1
arch/arm/cpu/arm920t/at91/cpu.c
View File

@ -40,4 +40,3 @@ int arch_cpu_init(void)
{ {
return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK); return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
} }

2
doc/README.SPL
View File

@ -34,7 +34,7 @@ endif
COBJS-$(CONFIG_SPL_BUILD) += foo.o COBJS-$(CONFIG_SPL_BUILD) += foo.o
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
foo(); foo();
#endif #endif

1
doc/README.at91-soc
View File

@ -39,4 +39,3 @@ The method for updating
3. add new structures for SoC access 3. add new structures for SoC access
4. Convert arch, driver and boards file to new SoC 4. Convert arch, driver and boards file to new SoC
5. remove legacy code, if all boards and drives are ready 5. remove legacy code, if all boards and drives are ready

22
doc/README.ublimage
View File

@ -101,22 +101,22 @@ This steps are done automagically if you do a "make all"
Structure of this binary (Example for the cam_enc_4xx board with a NAND Structure of this binary (Example for the cam_enc_4xx board with a NAND
page size = 0x800): page size = 0x800):
offset : 0x00000 | 0x800 | 0x3800 offset : 0x00000 | 0x800 | 0x3800
content: UBL | nand_spl | u-boot code content: UBL | nand_spl | u-boot code
Header | code | Header | code |
The NAND layout looks for example like this: The NAND layout looks for example like this:
(Example for the cam_enc_4xx board with a NAND page size = 0x800, block (Example for the cam_enc_4xx board with a NAND page size = 0x800, block
size = 0x20000 and CONFIG_SYS_NROF_UBL_HEADER 5): size = 0x20000 and CONFIG_SYS_NROF_UBL_HEADER 5):
offset : 0x80000 | 0xa0000 | 0xa3000 offset : 0x80000 | 0xa0000 | 0xa3000
content: UBL | nand_spl | u-boot code content: UBL | nand_spl | u-boot code
Header | code | Header | code |
^ ^ ^ ^
^ 0xa0000 = CONFIG_SYS_NROF_UBL_HEADER * 0x20000 ^ 0xa0000 = CONFIG_SYS_NROF_UBL_HEADER * 0x20000
^ ^
0x80000 = Block 4 * 0x20000 0x80000 = Block 4 * 0x20000
If the cpu starts in NAND boot mode, it checks the UBL descriptor If the cpu starts in NAND boot mode, it checks the UBL descriptor
starting with block 1 (page 0). When a valid UBL signature is found, starting with block 1 (page 0). When a valid UBL signature is found,
@ -132,7 +132,7 @@ read and processed.
Once the user-specified start-up conditions are set, the RBL copies the Once the user-specified start-up conditions are set, the RBL copies the
nand_spl into ARM internal RAM, starting at address 0x0000: 0020. nand_spl into ARM internal RAM, starting at address 0x0000: 0020.
^^^^ ^^^^
The nand_spl code itself now does necessary intializations, and at least, The nand_spl code itself now does necessary intializations, and at least,
copies the u-boot code from NAND into RAM, and jumps to it ... copies the u-boot code from NAND into RAM, and jumps to it ...

18
doc/README.usb
View File

@ -116,7 +116,7 @@ Bus 002 Device 010: ID 0b95:7720 ASIX Electronics Corp. AX88772
If you look at drivers/usb/eth/asix.c you will see this line within the If you look at drivers/usb/eth/asix.c you will see this line within the
supported device list, so we know this adapter is supported. supported device list, so we know this adapter is supported.
{ 0x0b95, 0x7720 }, /* Trendnet TU2-ET100 V3.0R */ { 0x0b95, 0x7720 }, /* Trendnet TU2-ET100 V3.0R */
If your adapter is not listed there is a still a chance that it will If your adapter is not listed there is a still a chance that it will
work. Try looking up the manufacturer of the chip inside your adapter. work. Try looking up the manufacturer of the chip inside your adapter.
@ -144,8 +144,8 @@ To enable USB Host Ethernet in U-Boot, your platform must of course
support USB with CONFIG_CMD_USB enabled and working. You will need to support USB with CONFIG_CMD_USB enabled and working. You will need to
add some config settings to your board header file: add some config settings to your board header file:
#define CONFIG_USB_HOST_ETHER /* Enable USB Ethernet adapters */ #define CONFIG_USB_HOST_ETHER /* Enable USB Ethernet adapters */
#define CONFIG_USB_ETHER_ASIX /* Asix, or whatever driver(s) you want */ #define CONFIG_USB_ETHER_ASIX /* Asix, or whatever driver(s) you want */
As with built-in networking, you will also want to enable some network As with built-in networking, you will also want to enable some network
commands, for example: commands, for example:
@ -168,9 +168,9 @@ You can also set the default IP address of your board and the server
as well as the default file to load when a 'bootp' command is issued. as well as the default file to load when a 'bootp' command is issued.
All of these can be obtained from the bootp server if not set. All of these can be obtained from the bootp server if not set.
#define CONFIG_IPADDR 10.0.0.2 (replace with your value) #define CONFIG_IPADDR 10.0.0.2 (replace with your value)
#define CONFIG_SERVERIP 10.0.0.1 (replace with your value) #define CONFIG_SERVERIP 10.0.0.1 (replace with your value)
#define CONFIG_BOOTFILE uImage #define CONFIG_BOOTFILE uImage
The 'usb start' command should identify the adapter something like this: The 'usb start' command should identify the adapter something like this:
@ -200,9 +200,9 @@ TFTP from server 172.22.72.144; our IP address is 172.22.73.81
Filename '/tftpboot/uImage-sjg-seaboard-261347'. Filename '/tftpboot/uImage-sjg-seaboard-261347'.
Load address: 0x40c000 Load address: 0x40c000
Loading: ################################################################# Loading: #################################################################
################################################################# #################################################################
################################################################# #################################################################
################################################ ################################################
done done
Bytes transferred = 3557464 (364858 hex) Bytes transferred = 3557464 (364858 hex)
CrOS> CrOS>

11
drivers/gpio/da8xx_gpio.c
View File

@ -27,13 +27,11 @@
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/davinci_misc.h> #include <asm/arch/davinci_misc.h>
static struct gpio_registry { static struct gpio_registry {
int is_registered; int is_registered;
char name[GPIO_NAME_SIZE]; char name[GPIO_NAME_SIZE];
} gpio_registry[MAX_NUM_GPIOS]; } gpio_registry[MAX_NUM_GPIOS];
#define pinmux(x) (&davinci_syscfg_regs->pinmux[x]) #define pinmux(x) (&davinci_syscfg_regs->pinmux[x])
static const struct pinmux_config gpio_pinmux[] = { static const struct pinmux_config gpio_pinmux[] = {
@ -183,8 +181,6 @@ static const struct pinmux_config gpio_pinmux[] = {
{ pinmux(18), 8, 2 }, { pinmux(18), 8, 2 },
}; };
int gpio_request(int gp, const char *label) int gpio_request(int gp, const char *label)
{ {
if (gp >= MAX_NUM_GPIOS) if (gp >= MAX_NUM_GPIOS)
@ -202,13 +198,11 @@ int gpio_request(int gp, const char *label)
return 0; return 0;
} }
void gpio_free(int gp) void gpio_free(int gp)
{ {
gpio_registry[gp].is_registered = 0; gpio_registry[gp].is_registered = 0;
} }
void gpio_toggle_value(int gp) void gpio_toggle_value(int gp)
{ {
struct davinci_gpio *bank; struct davinci_gpio *bank;
@ -217,7 +211,6 @@ void gpio_toggle_value(int gp)
gpio_set_value(gp, !gpio_get_value(gp)); gpio_set_value(gp, !gpio_get_value(gp));
} }
int gpio_direction_input(int gp) int gpio_direction_input(int gp)
{ {
struct davinci_gpio *bank; struct davinci_gpio *bank;
@ -227,7 +220,6 @@ int gpio_direction_input(int gp)
return 0; return 0;
} }
int gpio_direction_output(int gp, int value) int gpio_direction_output(int gp, int value)
{ {
struct davinci_gpio *bank; struct davinci_gpio *bank;
@ -238,7 +230,6 @@ int gpio_direction_output(int gp, int value)
return 0; return 0;
} }
int gpio_get_value(int gp) int gpio_get_value(int gp)
{ {
struct davinci_gpio *bank; struct davinci_gpio *bank;
@ -249,7 +240,6 @@ int gpio_get_value(int gp)
return ip ? 1 : 0; return ip ? 1 : 0;
} }
void gpio_set_value(int gp, int value) void gpio_set_value(int gp, int value)
{ {
struct davinci_gpio *bank; struct davinci_gpio *bank;
@ -262,7 +252,6 @@ void gpio_set_value(int gp, int value)
bank->clr_data = 1U << GPIO_BIT(gp); bank->clr_data = 1U << GPIO_BIT(gp);
} }
void gpio_info(void) void gpio_info(void)
{ {
int gp, dir, val; int gp, dir, val;

2
include/linux/mdio.h
View File

@ -127,8 +127,6 @@
MDIO_DEVS_DTEXS | \ MDIO_DEVS_DTEXS | \
MDIO_DEVS_AN) MDIO_DEVS_AN)
/* Control register 2. */ /* Control register 2. */
#define MDIO_PMA_CTRL2_TYPE 0x000f /* PMA/PMD type selection */ #define MDIO_PMA_CTRL2_TYPE 0x000f /* PMA/PMD type selection */
#define MDIO_PMA_CTRL2_10GBCX4 0x0000 /* 10GBASE-CX4 type */ #define MDIO_PMA_CTRL2_10GBCX4 0x0000 /* 10GBASE-CX4 type */