Skip to content

GitLab

U
u-boot
Commit b0689d5e authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Initial commit

parents
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 0 deletions
Makefile 0 → 100644
View file @ b0689d5e
opiplus2e: opiplus2e-boot-cmd opiplus2e-fw_env.config
tar xf u-boot-2018.05.tar.gz
patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-serial-number-fix.patch
patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch
patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-sunxi_env_in_mmc0.patch
$(MAKE) -C u-boot-2018.05 orangepi_plus2e_defconfig
$(MAKE) -C u-boot-2018.05
mkdir /uboot
mkfs -t vfat -n UBOOT /dev/$(DISK)1
sed -i '/\/dev\/root/a \/dev\/disk\/by-label\/UBOOT \/uboot vfat defaults,sync,auto 0 0' /etc/fstab
mount /dev/$(DISK)1 /uboot
dd if=u-boot-2018.05/u-boot-sunxi-with-spl.bin of=/dev/$(ROOT_DEVICE) bs=1024 seek=8
@echo "$$BOOTCMD_OPIPLUS2E" > u-boot-2018.05/boot.cmd
u-boot-2018.05/tools/mkimage -C none -A arm -T script -d u-boot-2018.05/boot.cmd /uboot/boot.scr
$(MAKE) -C u-boot-2018.05 envtools
cp u-boot-2018.05/tools/env/fw_printenv /sbin/fw_printenv
ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_OPIPLUS2E" > /etc/fw_env.config
/sbin/fw_setenv reset
umount /dev/$(DISK)1
rm -rf u-boot-2018.05
opiplus2e-boot-cmd:
define BOOTCMD_OPIPLUS2E
load mmc 0:2 $${kernel_addr_r} boot/zImage
load mmc 0:2 $${fdt_addr_r} boot/machine.dtb
setenv bootargs console=tty1 root=/dev/$(DISK)2 rootfstype=ext4 rootflags=discard rw rootwait elevator=noop quiet loglevel=3 systemd.show_status=1
bootz $${kernel_addr_r} - $${fdt_addr_r}
endef
export BOOTCMD_OPIPLUS2E
opiplus2e-fw_env.config:
define FW_ENV_OPIPLUS2E
/dev/$(ROOT_DEVICE) 0x88000 0x20000
endef
export FW_ENV_OPIPLUS2E
opipcplus: opipcplus-boot-cmd opipcplus-fw_env.config
tar xf u-boot-2018.05.tar.gz
patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-serial-number-fix.patch
patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch
patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-sunxi_env_in_mmc0.patch
$(MAKE) -C u-boot-2018.05 orangepi_pc_plus_defconfig
$(MAKE) -C u-boot-2018.05
mkdir /uboot
mkfs -t vfat -n UBOOT /dev/$(DISK)1
sed -i '/\/dev\/root/a \/dev\/disk\/by-label\/UBOOT \/uboot vfat defaults,sync,auto 0 0' /etc/fstab
mount /dev/$(DISK)1 /uboot
dd if=u-boot-2018.05/u-boot-sunxi-with-spl.bin of=/dev/$(ROOT_DEVICE) bs=1024 seek=8
@echo "$$BOOTCMD_OPIPCPLUS" > u-boot-2018.05/boot.cmd
u-boot-2018.05/tools/mkimage -C none -A arm -T script -d u-boot-2018.05/boot.cmd /uboot/boot.scr
$(MAKE) -C u-boot-2018.05 envtools
cp u-boot-2018.05/tools/env/fw_printenv /sbin/fw_printenv
ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_OPIPCPLUS" > /etc/fw_env.config
/sbin/fw_setenv reset
umount /dev/$(DISK)1
rm -rf u-boot-2018.05
opipcplus-boot-cmd:
define BOOTCMD_OPIPCPLUS
load mmc 0:2 $${kernel_addr_r} boot/zImage
load mmc 0:2 $${fdt_addr_r} boot/machine.dtb
setenv bootargs console=tty1 root=/dev/$(DISK)2 rootfstype=ext4 rootflags=discard rw rootwait elevator=noop quiet loglevel=3 systemd.show_status=1
bootz $${kernel_addr_r} - $${fdt_addr_r}
endef
export BOOTCMD_OPIPCPLUS
opipcplus-fw_env.config:
define FW_ENV_OPIPCPLUS
/dev/$(ROOT_DEVICE) 0x88000 0x20000
endef
export FW_ENV_OPIPCPLUS
rpi3b: rpi3b-boot-cmd rpi3b-fw_env.config rpi3b-config
tar xf u-boot-2018.05.tar.gz
patch -Np1 -d u-boot-2018.05 < u-boot-2018.05-serial-number-fix.patch
$(MAKE) -C u-boot-2018.05 rpi_3_defconfig
$(MAKE) -C u-boot-2018.05
mkdir /uboot
mkfs -t vfat -n UBOOT /dev/$(DISK)1
sed -i '/\/dev\/root/a \/dev\/disk\/by-label\/UBOOT \/uboot vfat defaults,sync,auto 0 0' /etc/fstab
mount /dev/$(DISK)1 /uboot
cp u-boot-2018.05/u-boot.bin /uboot/u-boot.bin
@echo "$$BOOTCMD_RPI3" > u-boot-2018.05/boot.cmd
u-boot-2018.05/tools/mkimage -C none -A arm -T script -d u-boot-2018.05/boot.cmd /uboot/boot.scr
@echo "$$RPI3CONFIG" > /uboot/config.txt
tar xf rpi3-firmware.tar.xz -C /uboot --no-same-owner
$(MAKE) -C u-boot-2018.05 envtools
cp u-boot-2018.05/tools/env/fw_printenv /sbin/fw_printenv
ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_RPI3" > /etc/fw_env.config
dd if=/dev/zero of=/uboot/uboot.env bs=1024 count=16
/sbin/fw_setenv reset
umount /dev/$(DISK)1
rm -rf u-boot-2018.05
rpi3b-boot-cmd:
define BOOTCMD_RPI3
load mmc 0:2 $${kernel_addr_r} boot/Image
load mmc 0:2 $${fdt_addr_r} boot/machine.dtb
setenv bootargs console=tty1 root=/dev/$(DISK)2 rootfstype=ext4 rootflags=discard rw rootwait elevator=noop quiet loglevel=3 systemd.show_status=1
booti $${kernel_addr_r} - $${fdt_addr_r}
endef
export BOOTCMD_RPI3
rpi3b-fw_env.config:
define FW_ENV_RPI3
/uboot/uboot.env 0x00000 0x04000
endef
export FW_ENV_RPI3
rpi3b-config:
define RPI3CONFIG
enable_uart=1
arm_control=0x200
device_tree_address=0x100
device_tree_end=0x8000
kernel=u-boot.bin
dtparam=i2c_arm=on
dtparam=spi=on
avoid_warnings=2
endef
export RPI3CONFIG
u-boot-2018.05-serial-number-fix.patch 0 → 100644
View file @ b0689d5e
diff -uNr u-boot-2018.05/board/raspberrypi/rpi/rpi.c u-boot-2018.05-serial-number-fix/board/raspberrypi/rpi/rpi.c
--- u-boot-2018.05/board/raspberrypi/rpi/rpi.c 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-serial-number-fix/board/raspberrypi/rpi/rpi.c 2018-06-18 00:02:17.490748265 +0930
@@ -371,9 +371,6 @@
int ret;
char serial_string[17] = { 0 };
- if (env_get("serial#"))
- return;
-
BCM2835_MBOX_INIT_HDR(msg);
BCM2835_MBOX_INIT_TAG_NO_REQ(&msg->get_board_serial, GET_BOARD_SERIAL);
diff -uNr u-boot-2018.05/board/sunxi/board.c u-boot-2018.05-serial-number-fix/board/sunxi/board.c
--- u-boot-2018.05/board/sunxi/board.c 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-serial-number-fix/board/sunxi/board.c 2018-06-18 00:02:17.490748265 +0930
@@ -663,6 +663,7 @@
uint8_t mac_addr[6];
char ethaddr[16];
int i, ret;
+ const char *env_serial;
ret = sunxi_get_sid(sid);
if (ret == 0 && sid[0] != 0) {
@@ -711,10 +712,10 @@
eth_env_set_enetaddr(ethaddr, mac_addr);
}
- if (!env_get("serial#")) {
- snprintf(serial_string, sizeof(serial_string),
- "%08x%08x", sid[0], sid[3]);
-
+ env_serial = env_get("serial#");
+ snprintf(serial_string, sizeof(serial_string),
+ "%08x%08x", sid[0], sid[3]);
+ if (!env_serial || (env_serial && !strcmp(serial_string, env_serial))) {
env_set("serial#", serial_string);
}
}
u-boot-2018.05-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch 0 → 100644
View file @ b0689d5e
diff -uNr u-boot-2018.05/arch/arm/mach-sunxi/clock_sun6i.c u-boot-2018.05-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers/arch/arm/mach-sunxi/clock_sun6i.c
--- u-boot-2018.05/arch/arm/mach-sunxi/clock_sun6i.c 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers/arch/arm/mach-sunxi/clock_sun6i.c 2018-06-18 00:09:14.269104776 +0930
@@ -115,11 +115,10 @@
int k = 1;
int m = 1;
- if (clk > 1152000000) {
- k = 2;
- } else if (clk > 768000000) {
+ if (clk >= 1368000000) {
k = 3;
- m = 2;
+ } else if (clk >= 768000000) {
+ k = 2;
}
/* Switch to 24MHz clock while changing PLL1 */
u-boot-2018.05-sunxi_env_in_mmc0.patch 0 → 100644
View file @ b0689d5e
diff -uNr u-boot-2018.05/include/configs/sunxi-common.h u-boot-2018.05-sunxi_env_in_mmc0/include/configs/sunxi-common.h
--- u-boot-2018.05/include/configs/sunxi-common.h 2018-05-08 01:02:36.000000000 +0930
+++ u-boot-2018.05-sunxi_env_in_mmc0/include/configs/sunxi-common.h 2018-06-18 00:07:53.957844101 +0930
@@ -150,13 +150,7 @@
#define CONFIG_BOARD_SIZE_LIMIT 0x7e000
#endif
-#if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1
-/* If we have two devices (most likely eMMC + MMC), favour the eMMC */
-#define CONFIG_SYS_MMC_ENV_DEV 1
-#else
-/* Otherwise, use the only device we have */
#define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
#define CONFIG_SYS_MMC_MAX_DEVICE 4
#elif defined(CONFIG_ENV_IS_NOWHERE)
#define CONFIG_ENV_SIZE (128 << 10)
u-boot.opipcplus.groups 0 → 100644
View file @ b0689d5e
bin
/sbin/.*
/var/lock/.*
bytecode
/.*\.py[oc]
etc
/etc/.*
u-boot.opiplus2e.groups 0 → 100644
View file @ b0689d5e
bin
/sbin/.*
/var/lock/.*
bytecode
/.*\.py[oc]
etc
/etc/.*
u-boot.rpi3b.groups 0 → 100644
View file @ b0689d5e
bin
/sbin/.*
/var/lock/.*
etc
/etc/.*
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment