From: Luca Ceresoli Date: Mon, 29 Jun 2015 22:05:22 +0000 (+0200) Subject: olimex_a20_olinuxino_lime: rename board dir to remove _lime suffix X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6d3b77e9703d9a71fa4d9dc1565709a0bcb6194d;p=buildroot.git olimex_a20_olinuxino_lime: rename board dir to remove _lime suffix The files in board/olimex/a20_olinuxino_lime/ work with minimal or no modifications for the Olimex A20-OLinuXino-Micro board, whose support is going to be added in a later commit. Rename the directory to clarify it's not restricted to the Lime anymore. Signed-off-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- diff --git a/board/olimex/a20_olinuxino/boot-mali.cmd b/board/olimex/a20_olinuxino/boot-mali.cmd new file mode 100644 index 0000000000..9fa5d65418 --- /dev/null +++ b/board/olimex/a20_olinuxino/boot-mali.cmd @@ -0,0 +1,5 @@ +setenv bootm_boot_mode sec +setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 consoleblank=0 ${extra} +ext4load mmc 0 0x43000000 /boot/script.bin +ext4load mmc 0 0x48000000 /boot/zImage +bootz 0x48000000 diff --git a/board/olimex/a20_olinuxino/boot.cmd b/board/olimex/a20_olinuxino/boot.cmd new file mode 100644 index 0000000000..44d9239a94 --- /dev/null +++ b/board/olimex/a20_olinuxino/boot.cmd @@ -0,0 +1,5 @@ +setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} +ext4load mmc 0 0x49000000 /boot/${fdtfile} +ext4load mmc 0 0x46000000 /boot/zImage +env set fdt_high ffffffff +bootz 0x46000000 - 0x49000000 diff --git a/board/olimex/a20_olinuxino/post-build.sh b/board/olimex/a20_olinuxino/post-build.sh new file mode 100755 index 0000000000..ac8d4df184 --- /dev/null +++ b/board/olimex/a20_olinuxino/post-build.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# args from BR2_ROOTFS_POST_SCRIPT_ARGS +# $2 path of boot.cmd +# $3 output directory for boot.scr + +MKIMAGE=$HOST_DIR/usr/bin/mkimage + +$MKIMAGE -A arm -O linux -T script -C none -d $2 $3/boot.scr + +if [ -e $BINARIES_DIR/script.bin ]; then + cp $BINARIES_DIR/script.bin $3/script.bin +fi diff --git a/board/olimex/a20_olinuxino/readme.txt b/board/olimex/a20_olinuxino/readme.txt new file mode 100644 index 0000000000..6b8391484b --- /dev/null +++ b/board/olimex/a20_olinuxino/readme.txt @@ -0,0 +1,102 @@ +A20-OLinuXino-LIME + +Intro +===== + +This is a open hardware board, +see https://www.olimex.com/Products/OLinuXino/open-source-hardware + +The legacy linux-sunxi kernels are based on the vendor code drops. +They are only useful when accelerated 3D graphics and multimedia support +is strictly necessary. + +The Mainline Kernel is already a much better choice for a headless server. +And also the mainline kernel works fine even for a basic Linux desktop +system running on top of a simple framebuffer, which may be good enough for +the users who do not need fancy 3D graphics or video playback acceleration. + +(see http://linux-sunxi.org/Linux_Kernel for more details) + +How to build it +=============== + + $ make olimex_a20_olinuxino_lime_defconfig + +or + + $ make olimex_a20_olinuxino_lime_mali_defconfig + +Compile everything and build the rootfs image: + + $ make + +Result of the build +------------------- + +After building, you should get a tree like this: + + output/images/ + +-- rootfs.ext2 + +-- rootfs.ext4 -> rootfs.ext2 + +-- script.bin (mali) + +-- sun7i-a20-olinuxino-lime.dtb (mainline) + +-- u-boot.bin + +-- u-boot-sunxi-with-spl.bin + `-- zImage + + +How to write the SD card +======================== + + +Prepare the SD card +------------------- + +Erase existing stuff, and create an unique Linux partition with `fdisk`. + + # fdisk /dev/sdX + Command (m for help): o + Building a new DOS disklabel with disk identifier 0xf9e1616a. + Changes will remain in memory only, until you decide to write them. + After that, of course, the previous content won't be recoverable. + + Command (m for help): n + Partition type: + p primary (0 primary, 0 extended, 4 free) + e extended + Select (default p): p + Partition number (1-4, default 1): 1 + First sector (2048-7626751, default 2048): 2048 + Last sector, +sectors or +size{K,M,G} (2048-7626751, default 7626751): + Using default value 7626751 + + Command (m for help): p + + Disk /dev/sdX: 3904 MB, 3904897024 bytes + 4 heads, 16 sectors/track, 119168 cylinders, total 7626752 sectors + Units = sectors of 1 * 512 = 512 bytes + Sector size (logical/physical): 512 bytes / 512 bytes + I/O size (minimum/optimal): 512 bytes / 512 bytes + Disk identifier: 0xf9e1616a + + Device Boot Start End Blocks Id System + /dev/sdX1 2048 7626751 3812352 83 Linux + + Command (m for help): w + The partition table has been altered! + + Calling ioctl() to re-read partition table. + Syncing disks. + +Copy images on the SD card +-------------------------- + + # dd if=output/images/rootfs.ext2 of=/dev/sdX1 + # dd if=output/images/u-boot-sunxi-with-spl.bin of=/dev/sdX bs=1024 seek=8 + + +Finish +====== + +Eject the SD card, insert it in the A20-OLinuXino-LIME board, and power it up. + diff --git a/board/olimex/a20_olinuxino_lime/boot-mali.cmd b/board/olimex/a20_olinuxino_lime/boot-mali.cmd deleted file mode 100644 index 9fa5d65418..0000000000 --- a/board/olimex/a20_olinuxino_lime/boot-mali.cmd +++ /dev/null @@ -1,5 +0,0 @@ -setenv bootm_boot_mode sec -setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 consoleblank=0 ${extra} -ext4load mmc 0 0x43000000 /boot/script.bin -ext4load mmc 0 0x48000000 /boot/zImage -bootz 0x48000000 diff --git a/board/olimex/a20_olinuxino_lime/boot.cmd b/board/olimex/a20_olinuxino_lime/boot.cmd deleted file mode 100644 index 44d9239a94..0000000000 --- a/board/olimex/a20_olinuxino_lime/boot.cmd +++ /dev/null @@ -1,5 +0,0 @@ -setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 ${extra} -ext4load mmc 0 0x49000000 /boot/${fdtfile} -ext4load mmc 0 0x46000000 /boot/zImage -env set fdt_high ffffffff -bootz 0x46000000 - 0x49000000 diff --git a/board/olimex/a20_olinuxino_lime/post-build.sh b/board/olimex/a20_olinuxino_lime/post-build.sh deleted file mode 100755 index ac8d4df184..0000000000 --- a/board/olimex/a20_olinuxino_lime/post-build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# args from BR2_ROOTFS_POST_SCRIPT_ARGS -# $2 path of boot.cmd -# $3 output directory for boot.scr - -MKIMAGE=$HOST_DIR/usr/bin/mkimage - -$MKIMAGE -A arm -O linux -T script -C none -d $2 $3/boot.scr - -if [ -e $BINARIES_DIR/script.bin ]; then - cp $BINARIES_DIR/script.bin $3/script.bin -fi diff --git a/board/olimex/a20_olinuxino_lime/readme.txt b/board/olimex/a20_olinuxino_lime/readme.txt deleted file mode 100644 index 6b8391484b..0000000000 --- a/board/olimex/a20_olinuxino_lime/readme.txt +++ /dev/null @@ -1,102 +0,0 @@ -A20-OLinuXino-LIME - -Intro -===== - -This is a open hardware board, -see https://www.olimex.com/Products/OLinuXino/open-source-hardware - -The legacy linux-sunxi kernels are based on the vendor code drops. -They are only useful when accelerated 3D graphics and multimedia support -is strictly necessary. - -The Mainline Kernel is already a much better choice for a headless server. -And also the mainline kernel works fine even for a basic Linux desktop -system running on top of a simple framebuffer, which may be good enough for -the users who do not need fancy 3D graphics or video playback acceleration. - -(see http://linux-sunxi.org/Linux_Kernel for more details) - -How to build it -=============== - - $ make olimex_a20_olinuxino_lime_defconfig - -or - - $ make olimex_a20_olinuxino_lime_mali_defconfig - -Compile everything and build the rootfs image: - - $ make - -Result of the build -------------------- - -After building, you should get a tree like this: - - output/images/ - +-- rootfs.ext2 - +-- rootfs.ext4 -> rootfs.ext2 - +-- script.bin (mali) - +-- sun7i-a20-olinuxino-lime.dtb (mainline) - +-- u-boot.bin - +-- u-boot-sunxi-with-spl.bin - `-- zImage - - -How to write the SD card -======================== - - -Prepare the SD card -------------------- - -Erase existing stuff, and create an unique Linux partition with `fdisk`. - - # fdisk /dev/sdX - Command (m for help): o - Building a new DOS disklabel with disk identifier 0xf9e1616a. - Changes will remain in memory only, until you decide to write them. - After that, of course, the previous content won't be recoverable. - - Command (m for help): n - Partition type: - p primary (0 primary, 0 extended, 4 free) - e extended - Select (default p): p - Partition number (1-4, default 1): 1 - First sector (2048-7626751, default 2048): 2048 - Last sector, +sectors or +size{K,M,G} (2048-7626751, default 7626751): - Using default value 7626751 - - Command (m for help): p - - Disk /dev/sdX: 3904 MB, 3904897024 bytes - 4 heads, 16 sectors/track, 119168 cylinders, total 7626752 sectors - Units = sectors of 1 * 512 = 512 bytes - Sector size (logical/physical): 512 bytes / 512 bytes - I/O size (minimum/optimal): 512 bytes / 512 bytes - Disk identifier: 0xf9e1616a - - Device Boot Start End Blocks Id System - /dev/sdX1 2048 7626751 3812352 83 Linux - - Command (m for help): w - The partition table has been altered! - - Calling ioctl() to re-read partition table. - Syncing disks. - -Copy images on the SD card --------------------------- - - # dd if=output/images/rootfs.ext2 of=/dev/sdX1 - # dd if=output/images/u-boot-sunxi-with-spl.bin of=/dev/sdX bs=1024 seek=8 - - -Finish -====== - -Eject the SD card, insert it in the A20-OLinuXino-LIME board, and power it up. - diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 62f0a4cfc7..33bc10eacc 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -13,8 +13,8 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino_lime/post-build.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino_lime/boot.cmd $(TARGET_DIR)/boot" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot.cmd $(TARGET_DIR)/boot" # Kernel BR2_LINUX_KERNEL=y diff --git a/configs/olimex_a20_olinuxino_lime_mali_defconfig b/configs/olimex_a20_olinuxino_lime_mali_defconfig index dde39ad074..2a9fa2bf59 100644 --- a/configs/olimex_a20_olinuxino_lime_mali_defconfig +++ b/configs/olimex_a20_olinuxino_lime_mali_defconfig @@ -13,8 +13,8 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino_lime/post-build.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino_lime/boot-mali.cmd $(TARGET_DIR)/boot" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot-mali.cmd $(TARGET_DIR)/boot" # Kernel BR2_LINUX_KERNEL=y