GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 01:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.denx.de/u-boot-samsung

Browse source
This commit is contained in:
Tom Rini 2019-01-06 19:42:55 -05:00
commit 7e40d0a38f
9 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/Kconfig
View file

@ -607,6 +607,7 @@ config ARCH_EXYNOS
select DM_SPI select DM_SPI
select DM_SPI_FLASH select DM_SPI_FLASH
select SPI select SPI
imply SYS_THUMB_BUILD
imply CMD_DM imply CMD_DM
imply FAT_WRITE imply FAT_WRITE

2
arch/arm/mach-exynos/include/mach/system.h
View file

@ -58,7 +58,7 @@ struct exynos5_sysreg {
/* Move 0xd3 value to CPSR register to enable SVC mode */ /* Move 0xd3 value to CPSR register to enable SVC mode */
#define svc32_mode_en() __asm__ __volatile__ \ #define svc32_mode_en() __asm__ __volatile__ \
("@ I&F disable, Mode: 0x13 - SVC\n\t" \ ("@ I&F disable, Mode: 0x13 - SVC\n\t" \
"msr cpsr_c, #0x13|0xC0\n\t" : : ) "msr cpsr_c, %0\n\t" : : "r"(0x13|0xC0))
/* Set program counter with the given value */ /* Set program counter with the given value */
#define set_pc(x) __asm__ __volatile__ ("mov pc, %0\n\t" : : "r"(x)) #define set_pc(x) __asm__ __volatile__ ("mov pc, %0\n\t" : : "r"(x))

7
doc/README.odroid
View file

@ -1,11 +1,11 @@
U-Boot for Odroid X2/U3/XU3/XU4 U-Boot for Odroid X2/U3/XU3/XU4/HC1
======================== ========================
1. Summary 1. Summary
========== ==========
This is a quick instruction for setup Odroid boards. This is a quick instruction for setup Odroid boards.
Board config: odroid_config for X2/U3 Board config: odroid_config for X2/U3
Board config: odroid-xu3_config for XU3/XU4 Board config: odroid-xu3_config for XU3/XU4/HC1
2. Supported devices 2. Supported devices
==================== ====================
@ -15,6 +15,7 @@ This U-BOOT config can be used on three boards:
with CPU Exynos 4412 rev 2.0 and 2GB of RAM with CPU Exynos 4412 rev 2.0 and 2GB of RAM
- Odroid XU3 - Odroid XU3
- Odroid XU4 - Odroid XU4
- Odroid HC1
with CPU Exynos5422 and 2GB of RAM with CPU Exynos5422 and 2GB of RAM
3. Boot sequence 3. Boot sequence
@ -121,7 +122,9 @@ Supported fdt files are:
- exynos4412-odroidx2.dtb - exynos4412-odroidx2.dtb
- exynos4412-odroidu3.dtb - exynos4412-odroidu3.dtb
- exynos5422-odroidxu3.dtb - exynos5422-odroidxu3.dtb
- exynos5422-odroidxu3-lite.dtb
- exynos5422-odroidxu4.dtb - exynos5422-odroidxu4.dtb
- exynos5422-odroidhc1.dtb
Supported kernel files are: Supported kernel files are:
- Image.itb - Image.itb

4
include/configs/odroid.h
View file

@ -40,7 +40,7 @@
/* Console configuration */ /* Console configuration */
#define CONFIG_BOOTCOMMAND "run distro_bootcmd ; run autoboot" #define CONFIG_BOOTCOMMAND "run distro_bootcmd ; run autoboot"
#define CONFIG_DEFAULT_CONSOLE "ttySAC1,115200n8" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- GENERATED_GBL_DATA_SIZE) - GENERATED_GBL_DATA_SIZE)
@ -157,7 +157,7 @@
"elif test -e mmc 0 uImage; then; " \ "elif test -e mmc 0 uImage; then; " \
"run boot_uimg;" \ "run boot_uimg;" \
"fi;\0" \ "fi;\0" \
"console=" CONFIG_DEFAULT_CONSOLE "\0" \ "console=" CONFIG_DEFAULT_CONSOLE \
"mmcbootdev=0\0" \ "mmcbootdev=0\0" \
"mmcbootpart=1\0" \ "mmcbootpart=1\0" \
"mmcrootdev=0\0" \ "mmcrootdev=0\0" \

5
include/configs/odroid_xu3.h
View file

@ -30,7 +30,7 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000)
#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
/* USB */ /* USB */
#define CONFIG_USB_EHCI_EXYNOS #define CONFIG_USB_EHCI_EXYNOS
@ -61,6 +61,7 @@
"exynos5422-odroidxu3.dtb fat 0 1;" \ "exynos5422-odroidxu3.dtb fat 0 1;" \
"exynos5422-odroidxu3-lite.dtb fat 0 1;" \ "exynos5422-odroidxu3-lite.dtb fat 0 1;" \
"exynos5422-odroidxu4.dtb fat 0 1;" \ "exynos5422-odroidxu4.dtb fat 0 1;" \
"exynos5422-odroidhc1.dtb fat 0 1;" \
"boot part 0 1;" \ "boot part 0 1;" \
"root part 0 2\0" "root part 0 2\0"
@ -99,7 +100,7 @@
MEM_LAYOUT_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \
BOOTENV \ BOOTENV \
"rootfstype=ext4\0" \ "rootfstype=ext4\0" \
"console=" CONFIG_DEFAULT_CONSOLE "\0"\ "console=" CONFIG_DEFAULT_CONSOLE \
"fdtfile=exynos5422-odroidxu3.dtb\0" \ "fdtfile=exynos5422-odroidxu3.dtb\0" \
"boardname=odroidxu3\0" \ "boardname=odroidxu3\0" \
"mmcbootdev=0\0" \ "mmcbootdev=0\0" \

4
include/configs/s5p_goni.h
View file

@ -87,7 +87,7 @@
#define CONFIG_BOOTCOMMAND "run mmcboot" #define CONFIG_BOOTCOMMAND "run mmcboot"
#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \ #define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \
" ${console} ${meminfo}" " ${console} ${meminfo}"
@ -134,7 +134,7 @@
"bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \ "bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \
"verify=n\0" \ "verify=n\0" \
"rootfstype=ext4\0" \ "rootfstype=ext4\0" \
"console=" CONFIG_DEFAULT_CONSOLE "\0"\ "console=" CONFIG_DEFAULT_CONSOLE \
"meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \ "meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \
"loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \ "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \
"mmcdev=0\0" \ "mmcdev=0\0" \

4
include/configs/s5pc210_universal.h
View file

@ -27,7 +27,7 @@
/* Console configuration */ /* Console configuration */
#define CONFIG_BOOTCOMMAND "run mmcboot" #define CONFIG_BOOTCOMMAND "run mmcboot"
#define CONFIG_DEFAULT_CONSOLE "ttySAC1,115200n8" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- GENERATED_GBL_DATA_SIZE) - GENERATED_GBL_DATA_SIZE)
@ -108,7 +108,7 @@
"mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \ "mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
"verify=n\0" \ "verify=n\0" \
"rootfstype=ext4\0" \ "rootfstype=ext4\0" \
"console=" CONFIG_DEFAULT_CONSOLE "\0" \ "console=" CONFIG_DEFAULT_CONSOLE \
"mtdparts=" CONFIG_MTDPARTS_DEFAULT \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT \
"mbrparts=" MBRPARTS_DEFAULT \ "mbrparts=" MBRPARTS_DEFAULT \
"meminfo=crashkernel=32M@0x50000000\0" \ "meminfo=crashkernel=32M@0x50000000\0" \

4
include/configs/trats.h
View file

@ -36,7 +36,7 @@
#define CONFIG_MACH_TYPE MACH_TYPE_TRATS #define CONFIG_MACH_TYPE MACH_TYPE_TRATS
#define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_BOOTCOMMAND "run autoboot"
#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- GENERATED_GBL_DATA_SIZE) - GENERATED_GBL_DATA_SIZE)
@ -120,7 +120,7 @@
"mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \ "mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
"verify=n\0" \ "verify=n\0" \
"rootfstype=ext4\0" \ "rootfstype=ext4\0" \
"console=" CONFIG_DEFAULT_CONSOLE "\0" \ "console=" CONFIG_DEFAULT_CONSOLE \
"meminfo=crashkernel=32M@0x50000000\0" \ "meminfo=crashkernel=32M@0x50000000\0" \
"nfsroot=/nfsroot/arm\0" \ "nfsroot=/nfsroot/arm\0" \
"bootblock=" CONFIG_BOOTBLOCK "\0" \ "bootblock=" CONFIG_BOOTBLOCK "\0" \

4
include/configs/trats2.h
View file

@ -34,7 +34,7 @@
/* Console configuration */ /* Console configuration */
#define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_BOOTCOMMAND "run autoboot"
#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- GENERATED_GBL_DATA_SIZE) - GENERATED_GBL_DATA_SIZE)
@ -103,7 +103,7 @@
"boottrace=setenv opts initcall_debug; run bootcmd\0" \ "boottrace=setenv opts initcall_debug; run bootcmd\0" \
"verify=n\0" \ "verify=n\0" \
"rootfstype=ext4\0" \ "rootfstype=ext4\0" \
"console=" CONFIG_DEFAULT_CONSOLE "\0" \ "console=" CONFIG_DEFAULT_CONSOLE \
"kernelname=uImage\0" \ "kernelname=uImage\0" \
"loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 " \ "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 " \
"${kernelname}\0" \ "${kernelname}\0" \