pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils various updates for the new pkgsrc u-boot wor...
details: https://anonhg.NetBSD.org/pkgsrc/rev/097d2f090554
branches: trunk
changeset: 450494:097d2f090554
user: mrg <mrg%pkgsrc.org@localhost>
date: Sun Apr 18 08:54:55 2021 +0000
description:
various updates for the new pkgsrc u-boot world order.
the whole u-boot package builds with the patches and distinfos
moved into the new places.
diffstat:
sysutils/u-boot-bananapi-r2/patches/patch-include_configs_mt7623.h | 48 -
sysutils/u-boot-bananapi-r2/patches/patch-include_image.h | 37 -
sysutils/u-boot-pinebook-pro/Makefile | 6 +-
sysutils/u-boot-pinebook-pro/patches/patch-arch_arm_dts_Makefile | 16 -
sysutils/u-boot-pinebook-pro/patches/patch-arch_arm_dts_rk3399-pinebook-pro-u-boot.dtsi | 35 -
sysutils/u-boot-pinebook-pro/patches/patch-arch_arm_dts_rk3399-pinebook-pro.dts | 692 ----------
sysutils/u-boot-pinebook-pro/patches/patch-arch_arm_mach-rockchip_rk3399_Kconfig | 28 -
sysutils/u-boot-pinebook-pro/patches/patch-arch_arm_mach-rockchip_rk3399_rk3399.c | 51 -
sysutils/u-boot-pinebook-pro/patches/patch-board_pine64_pinebook_pro_rk3399_Kconfig | 25 -
sysutils/u-boot-pinebook-pro/patches/patch-board_pine64_pinebook_pro_rk3399_MAINTAINERS | 18 -
sysutils/u-boot-pinebook-pro/patches/patch-board_pine64_pinebook_pro_rk3399_Makefile | 11 -
sysutils/u-boot-pinebook-pro/patches/patch-board_pine64_pinebook_pro_rk3399_pinebook-pro-rk3399.c | 202 --
sysutils/u-boot-pinebook-pro/patches/patch-configs-pinebook_pro-rk3399_defconfig | 88 -
sysutils/u-boot-pinebook-pro/patches/patch-configs_rock64-rk3328_defconfig | 14 -
sysutils/u-boot-pinebook-pro/patches/patch-configs_rockpro64-rk3399_defconfig | 14 -
sysutils/u-boot-pinebook-pro/patches/patch-include-configs-pinebook_pro_rk3399.h | 39 -
sysutils/u-boot-pinebook-pro/patches/patch-include_configs_rockchip-common.h | 48 -
sysutils/u-boot-pinebook/patches/patch-arch_arm_cpu_armv8_Kconfig | 15 -
sysutils/u-boot-pinebook/patches/patch-lib_bch.c | 26 -
sysutils/u-boot-rock64/patches/patch-arch_arm_cpu_armv8_Kconfig | 15 -
sysutils/u-boot-rock64/patches/patch-lib_bch.c | 39 -
sysutils/u-boot/distinfo-2018.11rc3 | 4 +-
sysutils/u-boot/distinfo-2020.01-rc5 | 16 +-
sysutils/u-boot/distinfo-2020.04 | 20 +
sysutils/u-boot/patches-2017.09/patch-arch_arm_cpu_armv8_Kconfig | 15 +
sysutils/u-boot/patches-2017.09/patch-lib_bch.c | 39 +
sysutils/u-boot/patches-2018.11rc3/patch-arch_arm_cpu_armv8_Kconfig | 15 +
sysutils/u-boot/patches-2018.11rc3/patch-lib_bch.c | 26 +
sysutils/u-boot/patches-2020.01-rc5/patch-arch_arm_dts_Makefile | 16 +
sysutils/u-boot/patches-2020.01-rc5/patch-arch_arm_dts_rk3399-pinebook-pro-u-boot.dtsi | 35 +
sysutils/u-boot/patches-2020.01-rc5/patch-arch_arm_dts_rk3399-pinebook-pro.dts | 692 ++++++++++
sysutils/u-boot/patches-2020.01-rc5/patch-arch_arm_mach-rockchip_rk3399_Kconfig | 28 +
sysutils/u-boot/patches-2020.01-rc5/patch-arch_arm_mach-rockchip_rk3399_rk3399.c | 51 +
sysutils/u-boot/patches-2020.01-rc5/patch-board_pine64_pinebook_pro_rk3399_Kconfig | 25 +
sysutils/u-boot/patches-2020.01-rc5/patch-board_pine64_pinebook_pro_rk3399_MAINTAINERS | 18 +
sysutils/u-boot/patches-2020.01-rc5/patch-board_pine64_pinebook_pro_rk3399_Makefile | 11 +
sysutils/u-boot/patches-2020.01-rc5/patch-board_pine64_pinebook_pro_rk3399_pinebook-pro-rk3399.c | 202 ++
sysutils/u-boot/patches-2020.01-rc5/patch-configs-pinebook_pro-rk3399_defconfig | 88 +
sysutils/u-boot/patches-2020.01-rc5/patch-configs_rock64-rk3328_defconfig | 14 +
sysutils/u-boot/patches-2020.01-rc5/patch-configs_rockpro64-rk3399_defconfig | 14 +
sysutils/u-boot/patches-2020.01-rc5/patch-include-configs-pinebook_pro_rk3399.h | 39 +
sysutils/u-boot/patches-2020.01-rc5/patch-include_configs_rockchip-common.h | 48 +
sysutils/u-boot/patches-2020.04/patch-include_configs_mt7623.h | 48 +
sysutils/u-boot/patches-2020.04/patch-include_image.h | 37 +
44 files changed, 1502 insertions(+), 1466 deletions(-)
diffs (truncated from 3163 to 300 lines):
diff -r 5369ede44818 -r 097d2f090554 sysutils/u-boot-bananapi-r2/patches/patch-include_configs_mt7623.h
--- a/sysutils/u-boot-bananapi-r2/patches/patch-include_configs_mt7623.h Sun Apr 18 08:05:54 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-$NetBSD: patch-include_configs_mt7623.h,v 1.2 2020/06/20 17:42:34 thorpej Exp $
-
-Set the bootm_size, kernel_addr_r, fdt_addr_r, scriptaddr, pxefile_addr_r,
-ramdisk_addr_r, and fdtfile environment varibles.
-
---- include/configs/mt7623.h.orig 2020-04-13 15:02:18.000000000 +0000
-+++ include/configs/mt7623.h 2020-06-20 17:33:23.538928996 +0000
-@@ -42,14 +42,39 @@
- #define MMC_SUPPORTS_TUNING
-
- /* DRAM */
-+#define SDRAM_OFFSET(x) 0x8##x
- #define CONFIG_SYS_SDRAM_BASE 0x80000000
-
- /* This is needed for kernel booting */
- #define FDT_HIGH "fdt_high=0xac000000\0"
-
-+/*
-+ * 128M RAM (256M minimum minus 64MB heap + 64MB for u-boot, stack, fb, etc.
-+ * 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
-+ * 1M script, 1M pxe and the ramdisk at the end.
-+ */
-+#define BOOTM_SIZE __stringify(0xa000000)
-+#define KERNEL_ADDR_R __stringify(SDRAM_OFFSET(4000000))
-+#define FDT_ADDR_R __stringify(SDRAM_OFFSET(5000000))
-+#define SCRIPT_ADDR_R __stringify(SDRAM_OFFSET(5100000))
-+#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(5200000))
-+#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(5300000))
-+
-+#define MEM_LAYOUT_ENV_SETTINGS \
-+ "bootm_size=" BOOTM_SIZE "\0" \
-+ "kernel_addr_r=" KERNEL_ADDR_R "\0" \
-+ "fdt_addr_r=" FDT_ADDR_R "\0" \
-+ "scriptaddr=" SCRIPT_ADDR_R "\0" \
-+ "pxefile_addr_r=" PXEFILE_ADDR_R "\0" \
-+ "ramdisk_addr_r=" RAMDISK_ADDR_R "\0"
-+
-+#define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"
-+
- /* Extra environment variables */
- #define CONFIG_EXTRA_ENV_SETTINGS \
-- FDT_HIGH
-+ FDT_HIGH \
-+ MEM_LAYOUT_ENV_SETTINGS \
-+ "fdtfile=" FDTFILE "\0"
-
- /* Ethernet */
- #define CONFIG_IPADDR 192.168.1.1
diff -r 5369ede44818 -r 097d2f090554 sysutils/u-boot-bananapi-r2/patches/patch-include_image.h
--- a/sysutils/u-boot-bananapi-r2/patches/patch-include_image.h Sun Apr 18 08:05:54 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-$NetBSD: patch-include_image.h,v 1.1 2020/06/20 17:42:34 thorpej Exp $
-
-Ensure the correct byte order macros are used when image.h is included
-in a host tool.
-
---- include/image.h.orig 2020-06-20 13:48:00.000000000 +0000
-+++ include/image.h 2020-06-20 13:51:12.000000000 +0000
-@@ -16,7 +16,6 @@
- #define __IMAGE_H__
-
- #include "compiler.h"
--#include <asm/byteorder.h>
- #include <stdbool.h>
-
- /* Define this to avoid #ifdefs later on */
-@@ -26,6 +25,13 @@ struct fdt_region;
- #ifdef USE_HOSTCC
- #include <sys/types.h>
-
-+#include <endian.h>
-+#if _BYTE_ORDER == _BIG_ENDIAN
-+# include <linux/byteorder/big_endian.h>
-+#else
-+# include <linux/byteorder/little_endian.h>
-+#endif
-+
- /* new uImage format support enabled on host */
- #define IMAGE_ENABLE_FIT 1
- #define IMAGE_ENABLE_OF_LIBFDT 1
-@@ -40,6 +46,7 @@ struct fdt_region;
-
- #else
-
-+#include <asm/byteorder.h>
- #include <lmb.h>
- #include <asm/u-boot.h>
- #include <command.h>
diff -r 5369ede44818 -r 097d2f090554 sysutils/u-boot-pinebook-pro/Makefile
--- a/sysutils/u-boot-pinebook-pro/Makefile Sun Apr 18 08:05:54 2021 +0000
+++ b/sysutils/u-boot-pinebook-pro/Makefile Sun Apr 18 08:54:55 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/04/18 07:30:28 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2021/04/18 08:54:56 mrg Exp $
PKGREVISION= 5
@@ -11,7 +11,7 @@
U_BOOT_IMAGE_TYPE= rk3399
# Patches kept in pinebook-pro; first worked there.
-DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-pinebook-pro/distinfo
-PATCHDIR= ${.CURDIR}/../../sysutils/u-boot-pinebook-pro/patches
+#DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-pinebook-pro/distinfo
+#PATCHDIR= ${.CURDIR}/../../sysutils/u-boot-pinebook-pro/patches
.include "../../sysutils/u-boot/u-boot-rockchip.mk"
diff -r 5369ede44818 -r 097d2f090554 sysutils/u-boot-pinebook-pro/patches/patch-arch_arm_dts_Makefile
--- a/sysutils/u-boot-pinebook-pro/patches/patch-arch_arm_dts_Makefile Sun Apr 18 08:05:54 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-arch_arm_dts_Makefile,v 1.1 2020/01/06 08:41:44 mrg Exp $
-
-Pinebook Pro support from https://patchwork.ozlabs.org/patch/1194525/
-
-diff --git arch/arm/dts/Makefile arch/arm/dts/Makefile
-index 5a64fcc5a7..affedfd666 100644
---- arch/arm/dts/Makefile
-+++ arch/arm/dts/Makefile
-@@ -116,6 +116,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
- rk3399-nanopi-m4.dtb \
- rk3399-nanopi-neo4.dtb \
- rk3399-orangepi.dtb \
-+ rk3399-pinebook-pro.dtb \
- rk3399-puma-ddr1333.dtb \
- rk3399-puma-ddr1600.dtb \
- rk3399-puma-ddr1866.dtb \
diff -r 5369ede44818 -r 097d2f090554 sysutils/u-boot-pinebook-pro/patches/patch-arch_arm_dts_rk3399-pinebook-pro-u-boot.dtsi
--- a/sysutils/u-boot-pinebook-pro/patches/patch-arch_arm_dts_rk3399-pinebook-pro-u-boot.dtsi Sun Apr 18 08:05:54 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-arch_arm_dts_rk3399-pinebook-pro-u-boot.dtsi,v 1.1 2020/01/06 08:41:44 mrg Exp $
-
-Pinebook Pro support from https://patchwork.ozlabs.org/patch/1194525/
-
-diff --git arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
-new file mode 100644
-index 0000000000..9b0cb7010f
---- /dev/null
-+++ arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
-@@ -0,0 +1,25 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * Copyright (C) 2019 Peter Robinson <pbrobinson at gmail.com>
-+ */
-+
-+#include "rk3399-u-boot.dtsi"
-+#include "rk3399-sdram-lpddr4-100.dtsi"
-+
-+/ {
-+ chosen {
-+ u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
-+ };
-+};
-+
-+&pmugrf {
-+ u-boot,dm-pre-reloc;
-+};
-+
-+&spiflash {
-+ u-boot,dm-pre-reloc;
-+};
-+
-+&uart2 {
-+ u-boot,dm-pre-reloc;
-+};
diff -r 5369ede44818 -r 097d2f090554 sysutils/u-boot-pinebook-pro/patches/patch-arch_arm_dts_rk3399-pinebook-pro.dts
--- a/sysutils/u-boot-pinebook-pro/patches/patch-arch_arm_dts_rk3399-pinebook-pro.dts Sun Apr 18 08:05:54 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,692 +0,0 @@
-$NetBSD: patch-arch_arm_dts_rk3399-pinebook-pro.dts,v 1.2 2020/01/14 08:44:03 mrg Exp $
-
-Pinebook Pro support from https://patchwork.ozlabs.org/patch/1194525/
-
-commit 2778aa7cb70946c4729ed6ae13dea5bd1cc688dc
-Author: dhivael <dhivael.git@eno.space>
-Date: Sat Jan 11 15:02:44 2020 +0100
-
- rk3399: pinebook: fix sdcard boot from emmc
-
- booting from emmc does not set all DT properties required for the sd
- slot to function properly. this is a copy of the linux DT configuration
- for the slot now.
-
-commit fd41e9330cf1635fa3bf4dabdfac42ee1bba963c
-Author: Emmanuel Vadot <manu%freebsd.org@localhost>
-Date: Tue Dec 31 22:13:03 2019 +0100
-
- PBP: Add regulator needed for usb
-
- The schematics indicate that the vcc3v3_s0 voltage is controlled by
- the LDO2 of the RK808 but this isn't true.
- It's controller by a gpio (named lcdvcc_en).
- Remove the name from the RK808 regulator and add a regulator-fixed
- controller by this gpio.
-
- Signed-off-by: Emmanuel Vadot <manu%freebsd.org@localhost>
-
-
---- arch/arm/dts/rk3399-pinebook-pro.dts.orig 2020-01-13 16:59:26.353181190 -0800
-+++ arch/arm/dts/rk3399-pinebook-pro.dts 2020-01-13 23:16:08.263344492 -0800
-@@ -0,0 +1,660 @@
-+/*
-+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
-+ *
-+ * SPDX-License-Identifier: GPL-2.0+
-+ */
-+
-+/dts-v1/;
-+#include <dt-bindings/input/linux-event-codes.h>
-+#include <dt-bindings/pwm/pwm.h>
-+#include <dt-bindings/pinctrl/rockchip.h>
-+#include "rk3399.dtsi"
-+#include "rk3399-opp.dtsi"
-+
-+/ {
-+ model = "Pine64 Pinebook Pro";
-+ compatible = "pine64,pinebook-pro", "rockchip,rk3399";
-+
-+ chosen {
-+ stdout-path = &uart2;
-+ };
-+
-+ aliases {
-+ spi0 = &spi1;
-+ };
-+
-+ backlight: backlight {
-+ compatible = "pwm-backlight";
-+ enable-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
-+ pwms = <&pwm0 0 740740 0>;
-+ };
-+
-+ gpio-keys {
-+ compatible = "gpio-keys";
-+ autorepeat;
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pwrbtn>;
-+
-+ power {
-+ debounce-interval = <100>;
-+ gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
-+ label = "GPIO Key Power";
-+ linux,code = <KEY_POWER>;
-+ wakeup-source;
-+ };
-+ };
-+
-+ /*
-+ leds {
-+ status = "okay";
-+ compatible = "gpio-leds";
-+
-+ work-led {
-+ label = "work";
-+ gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
-+ };
-+
-+ standby-led {
-+ label = "standby";
-+ gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
-+ };
-+ };
-+ */
-+
-+ sdio_pwrseq: sdio-pwrseq {
-+ compatible = "mmc-pwrseq-simple";
-+ clocks = <&rk808 1>;
-+ clock-names = "ext_clock";
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&wifi_enable_h>;
-+ power-off-delay-us = <500000>;
-+ post-power-on-delay-ms = <100>;
-+
-+ /*
-+ * On the module itself this is one of these (depending
-+ * on the actual card populated):
-+ * - SDIO_RESET_L_WL_REG_ON
-+ * - PDN (power down when low)
-+ */
-+ reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
-+ };
-+
-+ /* switched by pmic_sleep */
-+ vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
-+ compatible = "regulator-fixed";
-+ regulator-name = "vcc1v8_s3";
-+ regulator-always-on;
-+ regulator-boot-on;
-+ regulator-min-microvolt = <1800000>;
-+ regulator-max-microvolt = <1800000>;
-+ vin-supply = <&vcc_1v8>;
-+ };
-+
-+ dc_12v: dc-12v {
Home |
Main Index |
Thread Index |
Old Index