diff --git a/README.md b/README.md index 0237727625d037714c90fe896da86996b5eb2025..49eb69d418e3057130b48de5fe1fba44ca74f560 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ To build a 64bit Qemu image: freedombone-image -t qemu-x86_64 -s 8G -Other supported boards are cubieboard2, cubietruck, olinuxino-lime, olinuxino-lime2, olinuxino-micro and odroid-c2. +Other supported boards are cubieboard2, cubietruck, olinuxino-lime, olinuxino-lime2 and olinuxino-micro. If the image build fails with an error such as "/Error reading from server. Remote end closed connection/" then you can specify a debian package mirror repository manually with: diff --git a/man/freedombone-image.1.gz b/man/freedombone-image.1.gz index 0b97ff4d04713765baca84ba4bbd140761b6d98d..9e85f2d5374d46177c26d1df9faf741ad68fda09 100644 Binary files a/man/freedombone-image.1.gz and b/man/freedombone-image.1.gz differ diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup index 0cdc13166a2a91f2b34958dea0508feaa8c05ec7..14347140a02c854fb326f6cdb67c0c647f18d248 100755 --- a/src/freedombone-image-hardware-setup +++ b/src/freedombone-image-hardware-setup @@ -133,55 +133,6 @@ beaglebone_repack_kernel() { -d $initRd uInitrd ) } -odroidc2_setup_boot() { - dtb="$1" - - # Setup uEnv.txt - if grep -q btrfs /etc/fstab ; then - fstype=btrfs - else - fstype=ext4 - fi - kernelVersion=$(ls /usr/lib/*/${dtb}.dtb | head -1 | cut -d/ -f4) - version=$(echo $kernelVersion | sed 's/linux-image-\(.*\)/\1/') - initRd=initrd.img-$version - vmlinuz=vmlinuz-$version - - # based on http://odroid.com/dokuwiki/doku.php?id=en:c2_building_u-boot - cat >> /boot/uEnv.txt <<EOF -mmcroot=/dev/mmcblk0p2 ro -mmcrootfstype=$fstype rootwait fixrtc -mmcrootflags=subvol=@ - -console=ttyO0,115200n8 - -kernel_file=$vmlinuz -initrd_file=$initRd - -loadaddr=0x11000000 -initrd_addr=0x13000000 -fdtaddr=0x1000000 - -initrd_high=0xffffffff -fdt_high=0xffffffff - -loadkernel=load mmc \${mmcdev}:\${mmcpart} \${loadaddr} \${kernel_file} -loadinitrd=load mmc \${mmcdev}:\${mmcpart} \${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize} -loadfdt=load mmc \${mmcdev}:\${mmcpart} \${fdtaddr} /dtbs/\${fdtfile} - -m="1080p60hz" -m_bpp="32" - -loadfiles=run loadkernel; run loadinitrd; run loadfdt -mmcargs=setenv bootargs rootwait rw console=tty0 console=\${console} root=\${mmcroot} rootfstype=\${mmcrootfstype} rootflags=\${mmcrootflags} no_console_suspend hdmimode=${m} m_bpp=${m_bpp} fsck.fix=yes - -uenvcmd=run loadfiles; run mmcargs; booti \${loadaddr} \${initrd_addr}:\${initrd_size} \${fdtaddr} -EOF - - mkdir -p /boot/dtbs - cp /usr/lib/linux-image-*-armmp/* /boot/dtbs -} - a20_setup_boot() { dtb="$1" @@ -246,10 +197,6 @@ case "$MACHINE" in beaglebone_repack_kernel enable_serial_console ttyO0 ;; - odroid-c2) - odroidc2_setup_boot meson64_odroidc2 - enable_serial_console ttyO0 - ;; cubietruck) a20_setup_boot sun7i-a20-cubietruck.dtb enable_serial_console ttyS0 diff --git a/src/freedombone-image-make b/src/freedombone-image-make index bef16100a7da58d710dd5d596710fa7fa8a76d2c..25ab91aa406e4f681473e3a59b1626fdfe744a9b 100755 --- a/src/freedombone-image-make +++ b/src/freedombone-image-make @@ -83,9 +83,6 @@ logrotate module-init-tools netbase rsyslog udev debian-archive-keyring" # Packages needed on the beaglebone beaglebone_pkgs="linux-image-armmp u-boot-tools u-boot" -# Packages needed on the Odroid C2 devices: -odroidc2_pkgs="linux-image-arm64 u-boot-tools u-boot" - # Packages needed on the Allwinner A20 devices: a20_pkgs="linux-image-armmp-lpae u-boot-tools u-boot u-boot-sunxi" @@ -106,19 +103,6 @@ case "$MACHINE" in --no-extlinux \ --foreign /usr/bin/qemu-arm-static \ --roottype btrfs \ -" - ;; - odroid-c2) - extra_pkgs="$odroidc2_pkgs" - extra_opts="\ - --variant minbase \ - --bootoffset=2mib \ - --bootsize 128M \ - --boottype ext2 \ - --no-kernel \ - --no-extlinux \ - --foreign /usr/bin/qemu-arm-static \ - --roottype btrfs \ " ;; cubietruck | a20-olinuxino-lime | a20-olinuxino-lime2 | a20-olinuxino-micro | cubieboard2) diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile index c66839aba46d5c8f0ab3ee15bcbf4ed6de7a1fab..0d7610272efb28663818d385bd6f9c3953ff4dac 100755 --- a/src/freedombone-image-makefile +++ b/src/freedombone-image-makefile @@ -89,17 +89,6 @@ beaglebone: prep $(SIGN) @echo "Build complete." -# build Odroid C2 SD card image -odroid-c2: prep - $(eval ARCHITECTURE = aarch64) - $(eval MACHINE = odroid-c2) - $(MAKE_IMAGE) - @rm -f $(ARCHIVE) - $(XZ) $(IMAGE) - @echo "" - $(SIGN) - @echo "Build complete." - # build Cubieboard2 SD card image cubieboard2: prep $(eval ARCHITECTURE = armhf)