瀏覽代碼

Some speculative changes to support cubieboard2 image builds

Bob Mottram 9 年之前
父節點
當前提交
c06899dcaa
共有 3 個檔案被更改,包括 21 行新增6 行删除
  1. 1
    0
      src/freedombone-image-customise
  2. 7
    6
      src/freedombone-image-hardware-setup
  3. 13
    0
      src/freedombone-image-make

+ 1
- 0
src/freedombone-image-customise 查看文件

338
 chroot "$rootdir" apt-get install -y avahi-daemon avahi-utils avahi-discover avahi-autoipd
338
 chroot "$rootdir" apt-get install -y avahi-daemon avahi-utils avahi-discover avahi-autoipd
339
 chroot "$rootdir" apt-get install -y iptables dnsutils net-tools network-manager
339
 chroot "$rootdir" apt-get install -y iptables dnsutils net-tools network-manager
340
 chroot "$rootdir" apt-get install -y libnss-mdns libnss-myhostname libnss-gw-name
340
 chroot "$rootdir" apt-get install -y libnss-mdns libnss-myhostname libnss-gw-name
341
+chroot "$rootdir" apt-get install -y u-boot-sunxi
341
 
342
 
342
 chroot "$rootdir" /bin/bash -x <<EOF
343
 chroot "$rootdir" /bin/bash -x <<EOF
343
 git clone https://github.com/bashrc/freedombone /root/freedombone
344
 git clone https://github.com/bashrc/freedombone /root/freedombone

+ 7
- 6
src/freedombone-image-hardware-setup 查看文件

140
     initRd=initrd.img-$version
140
     initRd=initrd.img-$version
141
     vmlinuz=vmlinuz-$version
141
     vmlinuz=vmlinuz-$version
142
 
142
 
143
-    # boot.cmd for CubieTruck
143
+    # boot.cmd for Cubieboard2
144
+    # https://downloads.openwrt.org/chaos_calmer/15.05/sunxi/generic/uboot-sunxi-Cubieboard2/openwrt-sunxi-Cubieboard2-uEnv.txt
144
     cat >> /boot/boot.cmd <<EOF
145
     cat >> /boot/boot.cmd <<EOF
145
 setenv mmcdev 0
146
 setenv mmcdev 0
146
 setenv mmcpart 1
147
 setenv mmcpart 1
154
 setenv kernel_file $vmlinuz
155
 setenv kernel_file $vmlinuz
155
 setenv initrd_file $initRd
156
 setenv initrd_file $initRd
156
 
157
 
157
-setenv loadaddr 0x46000000
158
-setenv initrd_addr 0x48000000
159
-setenv fdtaddr 0x47000000
158
+setenv loadaddr 0x41000000
159
+setenv initrd_addr 0x43000000
160
+setenv fdtaddr 0x42000000
160
 
161
 
161
 setenv initrd_high 0xffffffff
162
 setenv initrd_high 0xffffffff
162
 setenv fdt_high 0xffffffff
163
 setenv fdt_high 0xffffffff
171
 run loadfiles; run mmcargs; bootz \${loadaddr} \${initrd_addr}:\${initrd_size} \${fdtaddr}
172
 run loadfiles; run mmcargs; bootz \${loadaddr} \${initrd_addr}:\${initrd_size} \${fdtaddr}
172
 EOF
173
 EOF
173
 
174
 
174
-    # boot.scr for CubieTruck
175
+    # boot.scr for Cubieboard2
175
     mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
176
     mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
176
 
177
 
177
-    # DTBs for CubieTruck
178
+    # DTBs for Cubieboard2
178
     mkdir -p /boot/dtbs
179
     mkdir -p /boot/dtbs
179
     cp /usr/lib/$kernelVersion/* /boot/dtbs
180
     cp /usr/lib/$kernelVersion/* /boot/dtbs
180
 
181
 

+ 13
- 0
src/freedombone-image-make 查看文件

86
  --roottype btrfs \
86
  --roottype btrfs \
87
 "
87
 "
88
     ;;
88
     ;;
89
+    cubieboard2 | cubietruck | a20-olinuxino-lime2 | a20-olinuxino-micro)
90
+       extra_pkgs="$a20_pkgs"
91
+       extra_opts="\
92
+ --variant minbase \
93
+ --bootoffset=1mib \
94
+ --bootsize 128M \
95
+ --boottype vfat \
96
+ --no-kernel \
97
+ --no-extlinux \
98
+ --foreign /usr/bin/qemu-arm-static \
99
+ --roottype btrfs \
100
+"
101
+       ;;
89
     virtualbox)
102
     virtualbox)
90
     extra_opts="\
103
     extra_opts="\
91
  --grub \
104
  --grub \