From b6e6bb2392cbf8d2e21685ae7b7d818436d146f6 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 22 Aug 2014 17:51:41 -0600 Subject: [PATCH 2/2] arch linux arm modifications --- include/configs/odroid.h | 163 ++++++++++++++++++----------------------------- 1 file changed, 62 insertions(+), 101 deletions(-) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index c0d4157..da1957e 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -14,6 +14,7 @@ #include +#define CONFIG_IDENT_STRING " Arch Linux ARM" #define CONFIG_SYS_PROMPT "Odroid # " /* Monitor Command Prompt */ #undef CONFIG_DEFAULT_DEVICE_TREE @@ -37,6 +38,7 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5E00000) #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000) #define CONFIG_SYS_TEXT_BASE 0x43e00000 +#define CONFIG_LOADADDR 0x40007FC0 #include /* Size of malloc() pool */ @@ -51,11 +53,12 @@ #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_CMD_BOOTZ +#define CONFIG_CMD_FS_GENERIC +#define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_FIT #define CONFIG_FIT_VERBOSE -#define CONFIG_BOOTARGS "Please use defined boot" -#define CONFIG_BOOTCOMMAND "run autoboot" -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" + +#define CONFIG_BOOTDELAY 3 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ - GENERATED_GBL_DATA_SIZE) @@ -70,35 +73,6 @@ #define CONFIG_ENV_OFFSET (SZ_1K * 1280) /* 1.25 MiB offset */ #define CONFIG_ENV_OVERWRITE -/* Partitions name */ -#define PARTS_BOOT "boot" -#define PARTS_ROOT "platform" - -#define CONFIG_DFU_ALT \ - "uImage fat 0 1;" \ - "zImage fat 0 1;" \ - "Image.itb fat 0 1;" \ - "uInitrd fat 0 1;" \ - "exynos4412-odroidu3.dtb fat 0 1;" \ - "exynos4412-odroidx2.dtb fat 0 1;" \ - ""PARTS_BOOT" part 0 1;" \ - ""PARTS_ROOT" part 0 2\0" \ - -#define CONFIG_SET_DFU_ALT_INFO -#define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) - -#define CONFIG_DFU_ALT_BOOT_EMMC \ - "u-boot raw 0x3e 0x800 mmcpart 1;" \ - "bl1 raw 0x0 0x1e mmcpart 1;" \ - "bl2 raw 0x1e 0x1d mmcpart 1;" \ - "tzsw raw 0x83e 0x138 mmcpart 1\0" - -#define CONFIG_DFU_ALT_BOOT_SD \ - "u-boot raw 0x3f 0x800;" \ - "bl1 raw 0x1 0x1e;" \ - "bl2 raw 0x1f 0x1d;" \ - "tzsw raw 0x83f 0x138\0" - /* * Bootable media layout: * dev: SD eMMC(part boot) @@ -107,77 +81,64 @@ * UBOOT 63 62 * TZSW 2111 2110 * ENV 2560 2560(part user) - * - * MBR Primary partiions: - * Num Name Size Offset - * 1. BOOT: 100MiB 2MiB - * 2. ROOT: - */ + #define CONFIG_EXTRA_ENV_SETTINGS \ - "loadkernel=fatload mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \ - "${kernelname}\0" \ - "loadinitrd=fatload mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \ - "${initrdname}\0" \ - "loaddtb=fatload mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} " \ - "${fdtfile}\0" \ - "check_ramdisk=" \ - "if run loadinitrd; then " \ - "setenv ramdisk_addr ${initrdaddr};" \ - "else " \ - "setenv ramdisk_addr;" \ - "fi;\0" \ - "check_dtb=" \ - "if run loaddtb; then " \ - "setenv image_addr ${kerneladdr} - ${fdtaddr};" \ - "else " \ - "setenv image_addr ${kerneladdr};" \ - "fi;\0" \ - "kernel_args=" \ - "setenv bootargs root=/dev/mmcblk${mmcrootdev}p${mmcrootpart}" \ - " rootwait ${console} ${opts}\0" \ - "boot_fit=" \ - "setenv kerneladdr 0x42000000;" \ - "setenv kernelname Image.itb;" \ - "run loadkernel;" \ - "run kernel_args;" \ - "bootm ${kerneladdr}#${boardname}\0" \ - "boot_uimg=" \ - "setenv kerneladdr 0x40007FC0;" \ - "setenv kernelname uImage;" \ - "run check_dtb;" \ - "run check_ramdisk;" \ - "run loadkernel;" \ - "run kernel_args;" \ - "bootm ${image_addr} ${ramdisk_addr};\0" \ - "boot_zimg=" \ - "setenv kerneladdr 0x40007FC0;" \ - "setenv kernelname zImage;" \ - "run check_dtb;" \ - "run check_ramdisk;" \ - "run loadkernel;" \ - "run kernel_args;" \ - "bootz ${image_addr} ${ramdisk_addr};\0" \ - "autoboot=" \ - "if test -e mmc 0 Image.itb; then; " \ - "run boot_fit;" \ - "elif test -e mmc 0 zImage; then; " \ - "run boot_zimg;" \ - "elif test -e mmc 0 uImage; then; " \ - "run boot_uimg;" \ - "fi;\0" \ - "console=" CONFIG_DEFAULT_CONSOLE \ - "mmcbootdev=0\0" \ - "mmcbootpart=1\0" \ - "mmcrootdev=0\0" \ - "mmcrootpart=2\0" \ - "bootdelay=0\0" \ - "dfu_alt_system="CONFIG_DFU_ALT \ - "dfu_alt_info=Please reset the board\0" \ - "consoleon=set console console=ttySAC1,115200n8; save; reset\0" \ - "consoleoff=set console console=ram; save; reset\0" \ - "initrdname=uInitrd\0" \ - "initrdaddr=42000000\0" \ - "fdtaddr=40800000\0" + "bootfile=zImage\0" \ + "bootdir=/boot\0" \ + "console=ttySAC1,115200\0" \ + "rdaddr=42000000\0" \ + "rdfile=initramfs-linux.img\0" \ + "fdtaddr=40800000\0" \ + "fdt_file=\0" /* rename to fdtfile when Odroid-X detection is available */ \ + "fdtdir=/boot/dtbs\0" \ + "optargs=\0" \ + "mmcdev=0\0" \ + "mmcroot=/dev/mmcblk0p1 rw rootwait\0" \ + "mmcargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "root=${mmcroot} " \ + "video=${video}\0" \ + "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ + "loadrd=load mmc ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \ + "loadfdt=echo loading ${fdtdir}/${fdt_file} ...; load mmc ${bootpart} ${fdtaddr} ${fdtdir}/${fdt_file}\0" \ + "mmcboot=mmc dev ${mmcdev}; " \ + "if mmc rescan; then " \ + "echo SD/MMC found on device ${mmcdev};" \ + "setenv bootpart ${mmcdev}:1; " \ + "echo Checking for: ${bootdir}/uEnv.txt ...;" \ + "if test -e mmc ${bootpart} ${bootdir}/uEnv.txt; then " \ + "load mmc ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \ + "env import -t ${loadaddr} ${filesize};" \ + "echo Loaded environment from ${bootdir}/uEnv.txt;" \ + "echo Checking if uenvcmd is set ...;" \ + "if test -n ${uenvcmd}; then " \ + "echo Running uenvcmd ...;" \ + "run uenvcmd;" \ + "fi;" \ + "fi; " \ + "if run loadimage; then " \ + "run mmcargs;" \ + "if run loadfdt; then " \ + "if run loadrd; then " \ + "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \ + "else " \ + "bootz ${loadaddr} - ${fdtaddr};" \ + "fi;" \ + "else " \ + "if run loadrd; then " \ + "bootz ${loadaddr} ${rdaddr}:${filesize};" \ + "else " \ + "bootz ${loadaddr};" \ + "fi;" \ + "fi;" \ + "else " \ + "echo No kernel found;" \ + "fi;" \ + "fi;\0" + +#define CONFIG_BOOTCOMMAND \ + "run mmcboot;" /* I2C */ #define CONFIG_CMD_I2C -- 1.9.0