forked from eewiki/u-boot-patches
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Robert Nelson <[email protected]>
- Loading branch information
1 parent
1a42820
commit 8978e0b
Showing
3 changed files
with
93 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,14 +17,47 @@ Defaults: | |
|
|
||
| fatload -> load | ||
| bootm -> bootz | ||
| loadfdt=load mmc ${bootpart} ${fdtaddr} /dtbs//${fdtfile} | ||
|
|
||
| #define CONFIG_BOOTCOMMAND \ | ||
| "mmc dev ${mmcdev};" \ | ||
| "if mmc rescan; then " \ | ||
| "echo SD/MMC found on device ${mmcdev};" \ | ||
| "if run loadbootenv; then " \ | ||
| "echo Loaded environment from uEnv.txt;" \ | ||
| "run importbootenv;" \ | ||
| "fi;" \ | ||
| "if test -n $uenvcmd; then " \ | ||
| "echo Running uenvcmd ...;" \ | ||
| "run uenvcmd;" \ | ||
| "fi;" \ | ||
| "if run loadzimage; then " \ | ||
| "run loadfdt;" \ | ||
| "run mmcboot;" \ | ||
| "fi;" \ | ||
| "fi;" | ||
|
|
||
| Signed-off-by: Robert Nelson <[email protected]> | ||
| --- | ||
| board/atmel/at91sam9260ek/at91sam9260ek.c | 10 +++++ | ||
| include/configs/at91sam9260ek.h | 63 +++++++++++++++++++++++++---- | ||
| 2 files changed, 66 insertions(+), 7 deletions(-) | ||
| arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c | 4 ++ | ||
| board/atmel/at91sam9260ek/at91sam9260ek.c | 10 +++ | ||
| include/configs/at91sam9260ek.h | 67 ++++++++++++++++++--- | ||
| 3 files changed, 73 insertions(+), 8 deletions(-) | ||
|
|
||
| diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c | ||
| index 19ec615..5e995e1 100644 | ||
| --- a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c | ||
| +++ b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c | ||
| @@ -203,6 +203,10 @@ void at91_macb_hw_init(void) | ||
| #if defined(CONFIG_GENERIC_ATMEL_MCI) | ||
| void at91_mci_hw_init(void) | ||
| { | ||
| + /* Enable mci clock */ | ||
| + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; | ||
| + writel(1 << ATMEL_ID_MCI, &pmc->pcer); | ||
| + | ||
| at91_set_a_periph(AT91_PIO_PORTA, 8, 1); /* MCCK */ | ||
| #if defined(CONFIG_ATMEL_MCI_PORTB) | ||
| at91_set_b_periph(AT91_PIO_PORTA, 1, 1); /* MCCDB */ | ||
| diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c | ||
| index 3aa394a..1e7b33e 100644 | ||
| --- a/board/atmel/at91sam9260ek/at91sam9260ek.c | ||
|
|
@@ -54,9 +87,18 @@ index 3aa394a..1e7b33e 100644 | |
| { | ||
| struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; | ||
| diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h | ||
| index ebcc69a..d43b03b 100644 | ||
| index ebcc69a..15bf865 100644 | ||
| --- a/include/configs/at91sam9260ek.h | ||
| +++ b/include/configs/at91sam9260ek.h | ||
| @@ -81,7 +81,7 @@ | ||
| #define CONFIG_RED_LED AT91_PIN_PA9 /* this is the power led */ | ||
| #define CONFIG_GREEN_LED AT91_PIN_PA6 /* this is the user led */ | ||
|
|
||
| -#define CONFIG_BOOTDELAY 3 | ||
| +#define CONFIG_BOOTDELAY 1 | ||
|
|
||
| /* | ||
| * BOOTP options | ||
| @@ -105,6 +105,7 @@ | ||
| #define CONFIG_CMD_PING 1 | ||
| #define CONFIG_CMD_DHCP 1 | ||
|
|
@@ -86,7 +128,7 @@ index ebcc69a..d43b03b 100644 | |
| /* Ethernet */ | ||
| #define CONFIG_MACB 1 | ||
| #define CONFIG_RMII 1 | ||
| @@ -218,14 +233,47 @@ | ||
| @@ -218,14 +233,49 @@ | ||
| #define CONFIG_ENV_OFFSET 0xc0000 | ||
| #define CONFIG_ENV_OFFSET_REDUND 0x100000 | ||
| #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ | ||
|
|
@@ -124,9 +166,11 @@ index ebcc69a..d43b03b 100644 | |
| + "bootz ${loadaddr} - ${fdtaddr}\0" | ||
| + | ||
| +#define CONFIG_BOOTCOMMAND \ | ||
| + "mmc dev ${mmcdev};" \ | ||
| + "if mmc rescan; then " \ | ||
| + "echo SD/MMC found on device ${mmcdev};" \ | ||
| + "if run loadbootenv; then " \ | ||
| + "echo Loaded environment from uEnv.txt;" \ | ||
| + "run importbootenv;" \ | ||
| + "fi;" \ | ||
| + "if test -n $uenvcmd; then " \ | ||
|
|
@@ -141,7 +185,7 @@ index ebcc69a..d43b03b 100644 | |
| #endif | ||
|
|
||
| #define CONFIG_SYS_PROMPT "U-Boot> " | ||
| @@ -235,6 +283,7 @@ | ||
| @@ -235,6 +285,7 @@ | ||
| #define CONFIG_SYS_LONGHELP 1 | ||
| #define CONFIG_CMDLINE_EDITING 1 | ||
| #define CONFIG_AUTO_COMPLETE | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,17 +17,43 @@ Defaults: | |
|
|
||
| fatload -> load | ||
| bootm -> bootz | ||
| loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile} | ||
|
|
||
| #define CONFIG_BOOTCOMMAND \ | ||
| "mmc dev ${mmcdev};" \ | ||
| "if mmc rescan; then " \ | ||
| "echo SD/MMC found on device ${mmcdev};" \ | ||
| "if run loadbootenv; then " \ | ||
| "echo Loaded environment from uEnv.txt;" \ | ||
| "run importbootenv;" \ | ||
| "fi;" \ | ||
| "if test -n $uenvcmd; then " \ | ||
| "echo Running uenvcmd ...;" \ | ||
| "run uenvcmd;" \ | ||
| "fi;" \ | ||
| "if run loadzimage; then " \ | ||
| "run loadfdt;" \ | ||
| "run mmcboot;" \ | ||
| "fi;" \ | ||
| "fi;" | ||
|
|
||
| Signed-off-by: Robert Nelson <[email protected]> | ||
| --- | ||
| include/configs/at91sam9x5ek.h | 60 ++++++++++++++++++++++++++++++++-------- | ||
| 1 file changed, 48 insertions(+), 12 deletions(-) | ||
| include/configs/at91sam9x5ek.h | 64 ++++++++++++++++++++++++++++++++-------- | ||
| 1 file changed, 51 insertions(+), 13 deletions(-) | ||
|
|
||
| diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h | ||
| index ee6e3fc..37d8e27 100644 | ||
| index ee6e3fc..ebc6d2f 100644 | ||
| --- a/include/configs/at91sam9x5ek.h | ||
| +++ b/include/configs/at91sam9x5ek.h | ||
| @@ -67,7 +67,7 @@ | ||
| #define CONFIG_ATMEL_LCD_RGB565 | ||
| #define CONFIG_SYS_CONSOLE_IS_IN_ENV | ||
|
|
||
| -#define CONFIG_BOOTDELAY 3 | ||
| +#define CONFIG_BOOTDELAY 1 | ||
|
|
||
| /* | ||
| * BOOTP options | ||
| @@ -153,6 +153,14 @@ | ||
| #define CONFIG_MMC | ||
| #define CONFIG_GENERIC_MMC | ||
|
|
@@ -43,7 +69,7 @@ index ee6e3fc..37d8e27 100644 | |
| #endif | ||
|
|
||
| /* FAT */ | ||
| @@ -226,18 +234,46 @@ | ||
| @@ -226,18 +234,48 @@ | ||
| #endif | ||
|
|
||
| #ifdef CONFIG_SYS_USE_MMC | ||
|
|
@@ -85,9 +111,11 @@ index ee6e3fc..37d8e27 100644 | |
| + "bootz ${loadaddr} - ${fdtaddr}\0" | ||
| + | ||
| +#define CONFIG_BOOTCOMMAND \ | ||
| + "mmc dev ${mmcdev};" \ | ||
| + "if mmc rescan; then " \ | ||
| + "echo SD/MMC found on device ${mmcdev};" \ | ||
| + "if run loadbootenv; then " \ | ||
| + "echo Loaded environment from uEnv.txt;" \ | ||
| + "run importbootenv;" \ | ||
| + "fi;" \ | ||
| + "if test -n $uenvcmd; then " \ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,11 +38,11 @@ bootm -> bootz | |
|
|
||
| Signed-off-by: Robert Nelson <[email protected]> | ||
| --- | ||
| include/configs/mx6qsabre_common.h | 78 +++++++++++++----------------------- | ||
| 1 file changed, 27 insertions(+), 51 deletions(-) | ||
| include/configs/mx6qsabre_common.h | 80 +++++++++++++----------------------- | ||
| 1 file changed, 28 insertions(+), 52 deletions(-) | ||
|
|
||
| diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h | ||
| index 9eda9ed..d98631c 100644 | ||
| index 9eda9ed..11b0fdb 100644 | ||
| --- a/include/configs/mx6qsabre_common.h | ||
| +++ b/include/configs/mx6qsabre_common.h | ||
| @@ -47,6 +47,11 @@ | ||
|
|
@@ -57,8 +57,12 @@ index 9eda9ed..d98631c 100644 | |
| #define CONFIG_GENERIC_MMC | ||
| #define CONFIG_BOUNCE_BUFFER | ||
| #define CONFIG_CMD_EXT2 | ||
| @@ -98,64 +103,35 @@ | ||
| "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ | ||
| @@ -95,67 +100,38 @@ | ||
| "initrd_high=0xffffffff\0" \ | ||
| "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ | ||
| "mmcpart=" __stringify(CONFIG_SYS_MMC_ENV_PART) "\0" \ | ||
| - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ | ||
| + "mmcroot=/dev/mmcblk0p2 rootwait ro\0" \ | ||
| "mmcargs=setenv bootargs console=${console},${baudrate} " \ | ||
| "root=${mmcroot}\0" \ | ||
| - "loadbootscript=" \ | ||
|
|
||