* [bug#67261] [PATCH 0/3] Update u-boot to 2023.10.
@ 2023-11-18 15:38 Herman Rimm via Guix-patches via
2023-11-18 16:01 ` [bug#67261] [PATCH 1/3] gnu: u-boot: Update " Herman Rimm via Guix-patches via
` (4 more replies)
0 siblings, 5 replies; 13+ messages in thread
From: Herman Rimm via Guix-patches via @ 2023-11-18 15:38 UTC (permalink / raw)
To: 67261; +Cc: Herman Rimm
I use an OrangePi R1 Plus LTS with a u-boot v2023.10 bootloader. I have
not performed any other tests. [PATCH 2/3], [PATCH 3/3] and boot log
below for context.
U-Boot TPL 2023.10 (Jan 01 1970 - 00:00:01)
LPDDR3, 333MHz
BW=32 Col=10 Bk=8 CS0 Row=14 CS1 Row=14 CS=2 Die BW=16 Size=1024MB
Trying to bofrom BOOTROM
Returning to boot ROM...
U-Boot SPL 2023.10 (Jan 01 1970 - 00:00:01 +0000)
Trying to boot from MMC1
NOTICE: BL31: v2.9(debug):
NOTICE: BL31: Built : 00:00:01, Ja1970
NOTICE: BL31:Rockchip release version: v1.2
INFO: ARMriver initialized
INFO: plat_rockchip_pmu_init: pd status 0xe
INFO: BL31: Initializing runtime services
INFO: BL31: cortex_a53: CPU workaround for 855873 was applied
WARNING: BL31: cortex_a53: CPU workaround for 1530924 was missing!
INFO: BL31: Preparing for EL3 exit to normal world
INFO: Entry point address = 0x200000
INFO: SPSR = 0x3c9
U-Boot 2023.10 (Jan 01 1970 - 00:00:01 +0000)
Model: Xunlong Orange Pi R1 Plus LTS
DRAM: 1 GiB (effective 1022 MiB)
PMIC: RK8050 (on=0x40, off=0x00)
Core: 230 devices, 24 uclasses, devicetree: separate
MMC: mmc@ff500000: 1
Loading Environment from MMC... *** Warning - bad CRC, using default environment
In: serial@ff130000
Out: serial@ff130000
Err: serial@ff130000
Model: Xunlong Orange Pi R1 Plus LTS
Net: eth0: ethernet@ff540000
Hit any key to stop autoboot: 2 \b\b\b 1 \b\b\b 0
** Booting bootflow 'mmc@ff500000.bootdev.part_1' with extlinux
Ignoring unknown command: UI
Gx Boot Options
1: GNU with Linux-Libre-Arm64-Generic 6.5.11
En: 1: GNU with Linux-Libre-Arm64-Generic 6.5.11
Retrieving file: /gnu/store/6xvsm2pcrdp37m3lkfnr4l25bzbc5ak4-linux-libre-arm64-gen.5.11/Image
Retrieving file: /gnu/store/bbz373zmkgp5lzxgb1fg669g9h8pnf4a-raw/initrd.cpio.gz
append: root=38af4c98-36ce-75db-2c68-4f6138af4c98 gnu.system=/gn/store/mcmag4nf78dncysnv914pil9i2bjlqs8-system gnu.load=/gnu/stoag4nf78dncysnv914pil9i2bjlqs8-system/boot modprobe.blacklist=usbmouse,usbkbd quiet
Retrieving file: /gnu/store/6xvsm2pcrdp37m3lbzbc5ak4-linux-libre-arm64-generic-6.5.11/lib/dtbs/rockchip/rk3328-orangepi-r1-plus-lts.dtb
Moving Image from 0x2080000 to 0x2200000, end=49e0000
## Flattened Device Tree blob at 01f00000
Booting using the ob at 0x1f00000
Working FDT set to 1f00000
Loading Ramdisk to 3c264000, end 3cf1cd86 ... OK
Loading Device Tree to 000000003c258000, end 000000003c263dd4 ... OK
Working FDT set to 3c258000
Starting kernel ...
GC Warning: pthread_getattr_np or pthread_attr_getstack failed for main thread
GC Warning: Could not open /proc/stat
Welcome, this is GNU's early boot Guile.
Use 'gnu.repl' for an initrd REPL.
loading kernel modules...
Guix_image: clean, 51582/122880 files, 413085/490575 blocks
loading '/gnu/store/mcmag4nf78dncysnv914pil9i2bjlqs8-system/bootmaking '/gnu/store/mcmag4nf78dncysnv914pil9i2bjlqs8-system' the current system...
setting up setuid programs in '/run/setuid-programs'...
populating /etc from /gnu/store/5g9ac9ginxp9qphgx3qisjwnlx807kfk-etc...
[ 13.700378] udevd[95]: no sender credentials received, messag[ 14.594642] 3-1:1.0: Missing Free firmware (non-Free firmware loading is disabled)
This is the GNU system. Welcome.
windmolen login: root
This is the GNU operating system, welcome!
root@windmolen ~# dmesg
[ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd034]
[ 0.000000] Linux version 6.5.11-arm64-generic (guix@guix) (aarch64-linux-gnu-gcc (GCC) 11.3.0, GNU ld (GNU Binutils) 2.38) #1 SMP PREEMPT 1
[ 0.000000] KASLR disabled due to lack of seed
[ 0.000000] Machirange Pi R1 Plus LTS
[ 0.000000] efi: UEFI not found.
[ 0.000000] NUMA: No NUMA configuration found
[ 0.000000] NUMA: Faking a node at [mem 0x0000000000200000-0x000000003fffffff]
[ 0.000000] NUMA: NODE_DATA [mem 0x3fdca8c0-0x3fdccfff]
[ 0.000000] Zone ranges:
[ 0.MA [mem 0x0000000000200000-0x000000003fffffff]
[ 0.0000 DMA32 empty
[ 0.000000] Normal empty
[ 0.000000] Movable zone start for each node
[ 0.000000] Early memory node ranges
[ 0.000000] node 0: [mem 0x0000000000200000-0x000000003fffffff]
[ 0.000000] Initmem setup node 0 [mem 00000000200000-0x000000003fffffff]
[ 0.000000] On node 0, zone DMA: 512 pages in unavailable ranges
[ 0.000000] cma: Rese2 MiB at 0x000000003a200000
[ 0.000000] psci: probing for conduit method from DT.
[ 0.000000] psci: PSCIv1.1 detected inware.
[ 0.000000] psci: Using standard PSCI v0.2 function IDs
[ 0.000000] psci: MIGRATE_INFO_TYPE not supported.
[ 000] psci: SMC Calling Convention v1.2
[ 0.000000] percpu: Embedded 22 pages/cpu s50408 r8192 d31512 u90112
[ 0.000000] pcpu-alloc: s50408 r8192 d31512 u90112 alloc=22*4096
[ 0.000000] pcpu-alloc: [0] 0 [0] 1 [0] 2 [0] 3
[ 0.000000] Detected VIPT I-cache on CPU0
[ 0.0 features: detected: ARM erratum 845719
[ 0.000000] alternatying boot alternatives
[ 0.000000] Kernel command line: root=38af4c98-36ce-75db-2c68-4f6138af4c98 gnu.system=/gnu/store/mcma8dncysnv914pil9i2bjlqs8-system gnu.load=/gnu/store/mcmag4nf78dncysnv914pil9i2bjlqs8-system/boot modprobe.blacklist=usbmouse,usbket
[ 0.000000] Dentry cache hash table entries: 131072 (order: 8, 1048576 bytes, linear)
[ 0.000000] Inode-cache hash tantries: 65536 (order: 7, 524288 bytes, linear)
[ 0.000000] Fallback order for Node 0: 0
[ 0.000000] Built 1 zonelists, ity grouping on. Total pages: 257544
[ 0.000000] Policy zone: DMA
[ 0.000000] mem auto-init: stack:off, heap alloc:off,free:off
[ 0.000000] software IO TLB: area num 4.
[ 0.000000] software IO TLB: mapped [mem 0x0000000036200000-0x00000000000] (64MB)
[ 0.000000] Memory: 873024K/1046528K available (16320K kernel code, 4218K rwdata, 10384K rodata, 9088K init, 616, 140736K reserved, 32768K cma-reserved)
[ 0.000000] SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=4, Nodes=1
[ 0.0000u: Preemptible hierarchical RCU implementation.
[ 0.000000] rcu: RCU event tracing is enabled.
[ 0.000000] rcu: RCU reting CPUs from NR_CPUS=256 to nr_cpu_ids=4.
[ 0.000000] Trampoline variant of Tasks RCU enabled.
[ 0.000000] Tracing variant of Tasks RCU enabled.
[ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies.
[ 0.000000] rcu: Adjusting geometry for _leaf=16, nr_cpu_ids=4
[ 0.000000] NR_IRQS: 64, nr_irqs: 64,ated irqs: 0
[ 0.000000] Root IRQ handler: gic_handle_irq
[ 0.000000] GIC: Using split EOI/Deactivate mode
[ 0.00000: srcu_init: Setting srcu_struct sizes based on contention.
[ 0.000000] arch_timer: cp15 timer(s) running at 24.00MHz (phys) 0.000000] clocksource: arch_sys_counter: mask: 0xffffffffffffff max_cycles: 0x588fe9dc0, max_idle_ns: 440795202592 ns
[ 001] sched_clock: 56 bits at 24MHz, resolution 41ns, wraps every 4398046511097ns
[ 0.002504] Console: colour dummy device 80x 0.002524] printk: console [tty0] enabled
[ 0.002735] Calibrating delay loop (skipped), value calculated using timer frequ. 48.00 BogoMIPS (lpj=96000)
[ 0.002760] pid_max: default: 32768 minimum: 301
[ 0.002895] LSM: initializing lsm=capabilitegrity
[ 0.003077] Mount-cache hash table entries: 2048 (order: 2, 16384 bytes, linear)
[ 0.003103] Mountpoint-cache hale entries: 2048 (order: 2, 16384 bytes, linear)
[ 0.006034] RCU Tasks: Setting shift to 2 and lim to 1 rcu_task_cb_adjust=1 0.006187] RCU Tasks Trace: Setting shift to 2 and lim to 1 rcu_task_cb_adjust=1.
[ 0.006546] rcu: Hierarchical SRCU impletion.
[ 0.006558] rcu: Max phase no-delay instances is 1000.
[ 0.011292] EFI services will not be available.
[ 0.01smp: Bringing up secondary CPUs ...
[ 0.012906] Detected VIPT I-cache on CPU1
[ 0.013083] CPU1: Booted secondary process0000000001 [0x410fd034]
[ 0.014146] Detected VIPT I-cache on CPU2
[ 0.014307] CPU2: Booted secondary processor 0x00000000x410fd034]
[ 0.015327] Detected VIPT I-cache on CPU3
[ 0.015485] CPU3: Booted secondary processor 0x0000000003 [0x410fd[ 0.015649] smp: Brought up 1 node, 4 CPUs
[ 0.015675] SMP: Total of 4 processors activated.
[ 0.015685] CPU featuresected: 32-bit EL0 Support
[ 0.015692] CPU features: detected: 32-bit EL1 Support
[ 0.015702] CPU features: detected: CRCstructions
[ 0.015838] CPU: All CPU(s) started at EL2
[ 0.016002] alternatives: applying system-wide alternatives
[ 21] devtmpfs: initialized
[ 0.031315] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 76450417850 ns
[ 0.031368] futex hash table entries: 1024 (order: 4, 65536 bytes, linear)
[ 0.033245] pinctrl core: initialized pi subsystem
[ 0.037163] DMI not present or invalid.
[ 0.038560] NET: Registered PF_NETLINK/PF_ROUTE protocol family
[ 409] DMA: preallocated 128 KiB GFP_KERNEL pool for atomic allocations
[ 0.040718] DMA: preallocated 128 KiB GFP_KERNEL|GFP_Dol for atomic allocations
[ 0.040984] DMA: preallocated 128 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations
[ 0.041audit: initializing netlink subsys (disabled)
[ 0.041522] audit: type=2000 audit(0.040:1): state=initialized audit_enabled=0
[ 0.043486] thermal_sys: Registered thermal governor 'step_wise'
[ 0.043510] thermal_sys: Registered thermal governor '_allocator'
[ 0.043659] cpuidle: using governor menu
[ 0.044072] hw-breakpoint: found 6 breakpoint and 4 watchpoint regi.
[ 0.044269] ASID allocator initialised with 65536 entries
[ 0.048502] Serial: AMBA PL011 UART driver
[ 0.078745] giochip0: Static allocation of GPIO base is deprecated, use dynamic allocation.
[ 0.079251] rockchip-gpio ff210000.gpio: probinctrl/gpio@ff210000
[ 0.080288] gpio gpiochip1: Static allocation of GPIO base is deprecated, use dynamic allocation.
[ 0681] rockchip-gpio ff220000.gpio: probed /pinctrl/gpio@ff220000
[ 0.081592] gpio gpiochip2: Static allocation of GPIO base recated, use dynamic allocation.
[ 0.081962] rockchip-gpio ff230000.gpio: probed /pinctrl/gpio@ff230000
[ 0.082784] gpiochip3: Static allocation of GPIO base is deprecated, use dynamic allocation.
[ 0.083135] rockchip-gpio ff240000.gpio: probedctrl/gpio@ff240000
[ 0.088867] Modules: 22560 pages in range for non-PLT usage
[ 0.088895] Modules: 514080 pages in rangPLT usage
[ 0.090265] HugeTLB: registered 1.00 GiB page size, pre-allocated 0 pages
[ 0.090294] HugeTLB: 0 KiB vmemmap c freed for a 1.00 GiB page
[ 0.090306] HugeTLB: registered 32.0 MiB page size, pre-allocated 0 pages
[ 0.090314] HugeTLBiB vmemmap can be freed for a 32.0 MiB page
[ 0.090325] HugeTLB: registered 2.00 MiB page size, pre-allocated 0 pages
[ 33] HugeTLB: 0 KiB vmemmap can be freed for a 2.00 MiB page
[ 0.090344] HugeTLB: registered 64.0 KiB page size, pre-allocateages
[ 0.090351] HugeTLB: 0 KiB vmemmap can be freed for a 64.0 KiB page
[ 0.093462] ACPI: Interpreter disabled.
[ 048] iommu: Default domain type: Translated
[ 0.097376] iommu: DMA domain TLB invalidation policy: strict mode
[ 0.097909 subsystem initialized
[ 0.098217] libata version 3.00 loaded.
[ 0.098591] usbcore: registered new interface driver usbf 0.098647] usbcore: registered new interface driver hub
[ 0.098707] usbcore: registered new device driver usb
[ 0.1001ps_core: LinuxPPS API ver. 1 registered
[ 0.100200] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <gi@linux.it>
[ 0.100226] PTP clock support registered
[ 0.100442] EDAC MC: Ver: 3.0.0
[ 0.102044] scmi_core: SCMI protbus registered
[ 0.103407] FPGA manager framework
[ 0.103614] Advanced Linux Sound Architecture Driver Initialized.
[ 05582] vgaarb: loaded
[ 0.106723] clocksource: Switched to clocksource arch_sys_counter
[ 0.107159] VFS: Disk quotas dqu.0
[ 0.107215] VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes)
[ 0.107545] pnp: PnP ACPI: disabled
[ 148] NET: Registered PF_INET protocol family
[ 0.120425] IP idents hash table entries: 16384 (order: 5, 131072 bytes, linear 0.122234] tcp_listen_portaddr_hash hash table entries: 512 (order: 1, 8192 bytes, linear)
[ 0.122285] Table-perturb hash entries: 65536 (order: 6, 262144 bytes, linear)
[ 0.122311] TCP established hash table entries: 8192 (order: 4, 65536 bytes,ar)
[ 0.122496] TCP bind hash table entries: 8192 (order: 6, 262144 bytes, linear)
[ 0.122950] TCP: Hash tables configurstablished 8192 bind 8192)
[ 0.123178] UDP hash table entries: 512 (order: 2, 16384 bytes, linear)
[ 0.123239] UDP-Lite able entries: 512 (order: 2, 16384 bytes, linear)
[ 0.123515] NET: Registered PF_UNIX/PF_LOCAL protocol family
[ 0.12428C: Registered named UNIX socket transport module.
[ 0.124309] RPC: Registered udp transport module.
[ 0.124317] RPC: Regd tcp transport module.
[ 0.124323] RPC: Registered tcp-with-tls transport module.
[ 0.124330] RPC: Registered tcp NFSv4ckchannel transport module.
[ 0.124356] PCI: CLS 0 bytes, default 64
[ 0.124694] Unpacking initramfs...
[ 0.131277] 1]: IPA Size Limit: 40 bits
[ 0.135326] kvm [1]: vgic interrupt IRQ9
[ 0.135403] kvm [1]: Hyp mode initialized successfu 0.137915] Initialise system trusted keyrings
[ 0.138396] workingset: timestamp_bits=42 max_order=18 bucket_order=0
[ 8527] zbud: loaded
[ 0.139449] squashfs: version 4.0 (2009/01/31) Phillip Lougher
[ 0.140077] NFS: Registering the id_rer key type
[ 0.140182] Key type id_resolver registered
[ 0.140191] Key type id_legacy registered
[ 0.140234] nfs4filt_init: NFSv4 File Layout Driver Registering...
[ 0.140245] nfs4flexfilelayout_init: NFSv4 Flexfile Layout Driver Registerin
[ 0.204024] Key type asymmetric registered
[ 0.204059] Asymmetric key parser 'x509' registered
[ 0.204241] Block laySI generic (bsg) driver version 0.4 loaded (major 245)
[ 0.204295] io scheduler mq-deadline registered
[ 0.204306] io scr kyber registered
[ 0.204370] io scheduler bfq registered
[ 0.228668] EINJ: ACPI disabled.
[ 0.259480] dma-pl330 ff0.dma-controller: Loaded driver for PL330 DMAC-241330
[ 0.259517] dma-pl330 ff1f0000.dma-controller: DBUFF-128x8bytes Num_C8 Num_Peri-20 Num_Events-16
[ 0.283350] Serial: 8250/16550 driver, 4 ports, IRQ sharing enabled
[ 0.290478] ff130000.serttyS2 at MMIO 0xff130000 (irq = 21, base_baud = 1500000) is a 16550A
[ 0.290612] printk: console [ttyS2] enabled
[ 0.294uperH (H)SCI(F) driver initialized
[ 0.295471] msm_serial: driver initialized
[ 0.297350] STM32 USART driver initialized 0.317296] loop: module loaded
[ 0.320278] megasas: 07.725.01.00-rc1
[ 0.331191] spi-nor spi0.0: spi-nor-generic (16384es)
[ 1.477401] Freeing initrd memory: 13024K
[ 1.488443] tun: Universal TUN/TAP device driver, 1.6
[ 1.490222] thunv, ver 1.0
[ 1.490316] thunder_bgx, ver 1.0
[ 1.490367] nicpf, ver 1.0
[ 1.492959] hns3: Hisilicon Ethernet Network r for Hip08 Family - version
[ 1.492984] hns3: Copyright (c) 2017 Huawei Corporation.
[ 1.493069] hclge is initializing 1.493125] e1000: Intel(R) PRO/1000 Network Driver
[ 1.493135] e1000: Copyright (c) 1999-2006 Intel Corporation.
[ 1.4931000e: Intel(R) PRO/1000 Network Driver
[ 1.493204] e1000e: Copyright(c) 1999 - 2015 Intel Corporation.
[ 1.493251] igb:l(R) Gigabit Ethernet Network Driver
[ 1.493260] igb: Copyright (c) 2007-2014 Intel Corporation.
[ 1.493307] igbvf: Inteigabit Virtual Function Network Driver
[ 1.493316] igbvf: Copyright (c) 2009 - 2012 Intel Corporation.
[ 1.494044] sky2:er version 1.30
[ 1.496883] VFIO - User Level meta-driver version: 0.3
[ 1.563255] dwc2 ff580000.usb: supply vusb_d not , using dummy regulator
[ 1.563517] dwc2 ff580000.usb: supply vusb_a not found, using dummy regulator
[ 1.576264] dwc2 f0.usb: DWC OTG Controller
[ 1.576326] dwc2 ff580000.usb: new USB bus registered, assigned bus number 1
[ 1.576381] dwc2 000.usb: irq 26, io mem 0xff580000
[ 1.577597] hub 1-0:1.0: USB hub found
[ 1.577657] hub 1-0:1.0: 1 port detected
[ 1661] xhci-hcd xhci-hcd.0.auto: xHCI Host Controller
[ 1.581719] xhci-hcd xhci-hcd.0.auto: new USB bus registered, assigned mber 2
[ 1.581932] xhci-hcd xhci-hcd.0.auto: hcc params 0x0220fe64 hci version 0x110 quirks 0x0000000002000010
[ 1.58202ci-hcd xhci-hcd.0.auto: irq 25, io mem 0xff600000
[ 1.582290] xhci-hcd xhci-hcd.0.auto: xHCI Host Controller
[ 1.582315]-hcd xhci-hcd.0.auto: new USB bus registered, assigned bus number 3
[ 1.582339] xhci-hcd xhci-hcd.0.auto: Host supports USB perSpeed
[ 1.582435] ehci-platform ff5c0000.usb: EHCI Host Controller
[ 1.582461] ohci-platform ff5d0000.usb: Generic Plm OHCI controller
[ 1.583626] hub 2-0:1.0: USB hub found
[ 1.583693] hub 2-0:1.0: 1 port detected
[ 1.584271] usb use don't know the algorithms for LPM for this host, disabling LPM.
[ 1.585203] hub 3-0:1.0: USB hub found
[ 1.585259] hub.0: 1 port detected
[ 1.585783] ehci-platform ff5c0000.usb: new USB bus registered, assigned bus number 4
[ 1.585800] ohatform ff5d0000.usb: new USB bus registered, assigned bus number 5
[ 1.586020] ehci-platform ff5c0000.usb: irq 27, io mem 0x000
[ 1.586074] ohci-platform ff5d0000.usb: irq 28, io mem 0xff5d0000
[ 1.587318] usbcore: registered new interface driv-storage
[ 1.593984] i2c_dev: i2c /dev entries driver
[ 1.597964] i2c 1-0018: Fixed dependency cycle(s) with /i2c@ff1600ic@18/regulators/DCDC_REG4
[ 1.598796] ehci-platform ff5c0000.usb: USB 2.0 started, EHCI 1.00
[ 1.600069] hub 4-0:1.0: Ub found
[ 1.600134] hub 4-0:1.0: 1 port detected
[ 1.605973] rk808-regulator rk808-regulator: there is no dvs0 gpio
[ 6032] rk808-regulator rk808-regulator: there is no dvs1 gpio
[ 1.633703] rk808-rtc rk808-rtc: registered as rtc0
[ 1.635rk808-rtc rk808-rtc: setting system clock to 2016-01-21T09:00:29 UTC (1453366829)
[ 1.646879] dw_wdt ff1a0000.watchdog: No vTOPs array specified
[ 1.647888] hub 5-0:1.0: USB hub found
[ 1.647965] hub 5-0:1.0: 1 port detected
[ 1.653413] cpu EM: created perf domain
[ 1.658455] sdhci: Secure Digital Host Controller Interface driver
[ 1.658478] sdhci: Copyrightierre Ossman
[ 1.659660] Synopsys Designware Multimedia Card Interface Driver
[ 1.661137] sdhci-pltfm: SDHCI platform andriver helper
[ 1.665797] ledtrig-cpu: registered to indicate activity on CPUs
[ 1.667796] SMCCC: SOC_ID: ARCH_SOC_ID noemented, skipping ....
[ 1.669108] usbcore: registered new interface driver usbhid
[ 1.669126] usbhid: USB HID core driv 1.674385] hw perfevents: enabled with armv8_cortex_a53 PMU driver, 7 counters available
[ 1.683645] NET: Registered PF_P protocol family
[ 1.683758] Key type dns_resolver registered
[ 1.693227] registered taskstats version 1
[ 1.693430]ng compiled-in X.509 certificates
[ 1.728389] clk: Disabling unused clocks
[ 1.729347] ALSA device list:
[ 1.729376] soundcards found.
[ 1.729730] dw-apb-uart ff130000.serial: forbid DMA for kernel console
[ 1.730399] dwmmc_rockchip ff5.mmc: IDMAC supports 32-bit address mode.
[ 1.730446] dwmmc_rockchip ff500000.mmc: Using internal DMA controller.
[ 1.730458] dwmmc_rockchip ff500000.mmc: Version ID is 270a
[ 1.730514] dwmmc_rockchip ff500000.mmcontroller at irq 44,32 bit host data width,256 deep fifo
[ 1.742795] mmc_host mmc0: Bus speed (slot 0) = 400000Hz (slot req 400000Hz, actual 400000HZ div =1650] Freeing unused kernel memory: 9088K
[ 1.761772] Run /init as init process
[ 1.7617ments:
[ 1.761782] /init
[ 1.761785] with environment:
[ 1.761788] HOME=/
[ 1.761791] TERM=linux
[ 1.795678] mmc_host mmc0: Bu= 50000000Hz (slot req 50000000Hz, actual 50000000HZ div = 0)
[ 1.795853] mmc0: new high speddress b368
[ 1.797123] mmcblk0: mmc0:b368 NCard 58.2 GiB
[ 1.801099] mmcblk0: p1
[ 1: new SuperSpeed USB device number 2 using xhci-hcd
[ 2.599597] EXT4-fs (mmcblk0p1): mounte75db-2c68-4f6138af4c98 r/w with ordered data mode. Quota mode: none.
[ 8.930724] random: crn 11.510804] shepherd[1]: Starting service root...
[ 11.513341] shepherd[1]: Service root star35] shepherd[1]: Service root running with value #t.
[ 11.518407] shepherd[1]: Service root h
[ 12.687247] shepherd[1]: starting services...
[ 12.692430] shepherd[1]: Configuration sucrom '/gnu/store/06nwcs7k5m1xbyiyblfx0l3smrpin05p-shepherd.conf'.
[ 12.707165] shepherd[1]: Starting service user-file-systems...
[ 12.709500] shepherd[1]: Starting service root-file-system...
[ 12.711836] shepherd[1g service host-name...
[ 12.714004] shepherd[1]: Starting service pam...
[ 12.716361] shep service sysctl...
[ 12.718576] shepherd[1]: Starting service loopback...
[ 12.721201] shee user-file-systems started.
[ 12.723704] shepherd[1]: Service root-file-system started.
[ 1]: Service host-name started.
[ 12.727986] shepherd[1]: Service pam started.
[ 13.089547] shepherd[1]: Service loopback started.
[ 13.091971] shepherdice user-file-systems running with value #t.
[ 13.093951] shepherd[1]: Service user-file-systems has been started.
[ 13.096282] shepherd[1]: Service root-ning with value #t.
[ 13.098331] shepherd[1]: Service root-file-system has been started.
[ erd[1]: Service host-name running with value #<unspecified>.
[ 13.102819] shepherd[1]: Servicarted.
[ 13.104868] shepherd[1]: Service pam running with value #t.
[ 13.106870] shepherd[een started.
[ 13.124634] shepherd[1]: Service loopback running with value #t.
[ 13.127090rvice loopback has been started.
[ 13.133150] shepherd[1]: Starting service udev...
[ 13.11]: waiting for udevd...
[ 13.316228] udevd[95]: starting version 3.2.11
[ 13.465753] udevd[95]: starting eudev-3.2.11
[ 13.700378] udevd[95]: no sendeals received, message ignored
[ 13.712445] shepherd[1]:
[ 13.713589] [
[ 13.714489] sy ]
[ 13.717053] fs.protected_hardlinks = 1
[ 13.719742] shepherd[1]:
[ 13.720837] [
[ 13.721924] sysctl
[ 13.723212] ]
[ 13.724537] fs.prs = 1
[ 13.730192] shepherd[1]: Service sysctl has been started.
[ 13.732955] shepherd[1]: Service sysctl started.
[ 13.736118] shepherd[1]: Service ctl running with value #t.
[ 13.742266] shepherd[1]: Starting service virtual-terminal...
[ 13.746455] shepherd[1]: Service virtual-terminal started.
[ Service virtual-terminal running with value #t.
[ 13.753347] shepherd[1]: Service virtual-terminal has been started.
[ 14.320752] usbcore: registered new ice driver r8152-cfgselector
[ 14.451162] lima ff300000.gpu: gp - mali450 version major 0 minor 0
[ 14.451255] lima ff300000.gpu: pp0 - mali450 version ma.451322] lima ff300000.gpu: pp1 - mali450 version major 0 minor 0
[ 14.451368] lima ff300000. 4-way, 64byte cache line, 128bit external bus
[ 14.451380] lima ff300000.gpu: l2 cache 64K, , 128bit external bus
[ 14.451933] lima ff300000.gpu: bus rate = 163840000
[ 14.451962] lima ff300000.gpu: mod rate = 163840000
[ 14.452749] [drm] Initd lima 1.1.0 20191231 for ff300000.gpu on minor 0
[ 14.506754] mc: Linux media interface: v0.10
[ 14.530542] rk_gmac-dwmac ff540000.ethernet: IRQ eth_wake
[ 14.530573] rk_gmac-dwmac ff540000.ethernet: IRQ eth_lpi not found
[ 14.530771] rk_gmac-dernet: PTP uses main clock
[ 14.531047] rk_gmac-dwmac ff540000.ethernet: clock input or outpu] rk_gmac-dwmac ff540000.etherne
[ 14.531070] rk_gmac-dwmac ff540000.ethernet: RX delay(0x5).
[ 14.531088] rk_gmac-dwmac ff540000.ethernet: integrated PHY? (no).
[ 14.531129] rk_gmac-dwmac ff540000.ethernet: clock input from PHY
[ 14.536156] rk_mac ff540000.ethernet: init for RGMII
[ 14.536671] rk_gmac-dwc ff540000.ethernet: User ID: 0x10, Synopsys ID: 0x35
[ 14.536720] rk_gmac-dwmac ff540000.ethernet: DWMAC1000
[ 14.536730] rk_gmac-dwmac ff540000.etherne capability register supported
[ 14.536740] rk_gmac-dwmac ff50000.ethernet: RX Checksum Offload Engine supported
[ 14.536747] rk_gmac-dwmac ff540000.ethernet: COE Type 2
[ 14.536755] rk_gmac-dwmac ff540000.ethernet:ertion supported
[ 14.536762] rk_gmac-dwmac ff540000.ethernet Wake-Up On Lan supported
[ 14.536979] rk_gmac-dwmac ff540000.ethernet: Normal descriptors
[ 14.536998] rk_gmac-dwmac ff540000.ethernet: Ring mode enabled537006] rk_gmac-dwmac ff540000.ethernet: Enable RX Mitigation vi HW Watchdog Timer
[ 14.559096] r8152-cfgselector 3-1: reset SuperSpeed USB device number 2 using xhci-hcd
[ 14.578879] videodev: Linux video capture inte2.00
[ 14.594642] 3-1:1.0: Missing Free firmware (non-Free fimware loading is disabled)
[ 14.657291] r8152 3-1:1.0: unable to load firmware patch /*(DEBLOBBED)*/ (-2)
[ 14.707307] r8152 3-1:1.0 eth0: v1.12.13
[ 1: registered new interface driver r8152
[ 14.758296] usbcore:registered new interface driver cdc_ether
[ 14.817489] hantro-vpu ff350000.video-codec: Adding to iommu group 0
[ 14.818853] hantro-vpu ff350000.video-codstered rockchip,rk3328-vpu-dec as /dev/video0
[ 14.819768] uscore: registered new interface driver r8153_ecm
[ 14.939241] shepherd[1]: Service udev has been started.
[ 14.941983] shepherd[1]: Service udev started.
4986] shepherd[1]: Service udev running with value 95.
[ 14.93641] shepherd[1]: Starting service file-system-/dev/pts...
[ 14.965452] shepherd[1]: Starting service file-system-/sys/kernel/debug...
[ 14.970547] shephfile-system-/dev/pts started.
[ 14.974384] shepherd[1]: Servie file-system-/sys/kernel/debug started.
[ 14.976555] shepherd[1]: Service file-system-/dev/pts running with value #t.
[ 14.978327] shepherd[1]: Service fm-/dev/pts has been started.
[ 14.980167] shepherd[1]: Startig service file-system-/dev/shm...
[ 14.982113] shepherd[1]: Service file-system-/sys/kernel/debug running with value #t.
[ 14.984084] shepherd[1]: Servicestem-/sys/kernel/debug has been started.
[ 14.988054] shepher[1]: Service file-system-/dev/shm started.
[ 14.989929] shepherd[1]: Starting service file-system-/sys/firmware/efi/efivars...
[ 14.991996] shepherd[1]: System-/dev/shm running with value #t.
[ 14.993797] shepherd[1]: Service file-system-/dev/shm .997073] shepherd[1]: Service file-system-/sys/firmware/efi/efivrs started.
[ 14.999014] shepherd[1]: Starting service file-system-/gnu/store...
[ 15.001042] shepherd[1]: Service file-system-/sys/firmware/efi/efivars rith value #t.
[ 15.003002] shepherd[1]: Service file-system-/s/firmware/efi/efivars has been started.
[ 15.007148] shepherd[1]: Service file-system-/gnu/store started.
[ 15.009336] shepherd[1]: Service file-system-/re running with value #t.
[ 15.011304] shepherd[1]: Service fe-system-/gnu/store has been started.
[ 15.017939] shepherd[1]: Starting service file-systems...
[ 15.019930] shepherd[1]: Service file-systems started.
hepherd[1]: Service file-systems running with value #t.
[ 15.4092] shepherd[1]: Service file-systems has been started.
[ 15.028838] shepherd[1]: Starting service user-homes...
[ 15.031581] shepherd[1]: Service user-arted.
[ 15.033611] shepherd[1]: Service user-homes running with value #t.
[ 15.035497] shepherd[1]: Service user-homes has been started.
[ 15.040530] rting service urandom-seed...
[ 15.054120] shepherd[1]: Service urandom-seed started.
[ 15[1]: Service urandom-seed running with value #t.
[ 15.058480] shepherd[1]: Service urandom-se 15.068987] shepherd[1]: Startiesses...
[ 15.071266] shepherd[1]: Service user-processes started.
[ 15.073551] shepherd[1]: Service user-processes running with value #t.
[ 15.075485]rvice user-processes has been started.
[ 15.085954] shepherd[1]: Starting service guix-daemon5] shepherd[1]: Service guix-daemon started.
[ 15.102349] shepherd[1]: Service guix-daemon rue 129.
[ 15.105829] shepherd[1]: Service guix-daemon has been started.
[ 15.111658] shepheslogd...
[ 15.131403] shepherd[1]: Starting service mcron...
[ 15.143534] shepherd[1]: Sered.
[ 15.147379] shepherd[1]: Service mcron running with value 131.
[ 15.150642] shepherd[1]: Service mcron has been start 15.187861] shepherd[1]: Starting service networking...
[ 15.206627] rk_gmac-dwmac ff540000.ethernet eth1: Register MEM_TYPE_POOL RxQ-0
[ 15.326936] rk_gmac-dwmac ff540000.ethernet eth1: PHY [stmmac-0:00] driver [Generic PHY] (irq=POLL)
[ 15.337rk_gmac-dwmac ff540000.ethernet eth1: No Safety Features support found
[ 15.337115] rk_gmac-dwmac ff540000.ethernet eth1: PTPupported by HW
[ 15.337845] rk_gmac-dwmac ff540000.ethernet eth1: configuring for phy/rgmii link mode
[ 15.416459] NET: Rered PF_INET6 protocol family
[ 15.419795] Segment Routing with IPv6
[ 15.419880] In-situ OAM (IOAM) with IPv6
Herman Rimm (3):
gnu: u-boot: Update to 2023.10.
gnu: bootloader: Add orangepi-r1-plus-lts-rk3328 bootloader.
images: Add orangepi-r1-plus-lts image.
gnu/bootloader/u-boot.scm | 17 +++++
gnu/local.mk | 5 +-
gnu/packages/bootloaders.scm | 29 ++++---
.../u-boot-allow-disabling-openssl.patch | 56 +++++++-------
.../u-boot-fix-build-python-3.10.patch | 37 ---------
.../patches/u-boot-fix-u-boot-lib-build.patch | 24 ------
.../u-boot-rk3399-enable-emmc-phy.patch | 26 -------
.../patches/u-boot-rockchip-inno-usb.patch | 16 ++--
.../images/orangepi-r1-plus-lts-rk3328.scm | 76 +++++++++++++++++++
gnu/system/install.scm | 7 ++
10 files changed, 158 insertions(+), 135 deletions(-)
delete mode 100644 gnu/packages/patches/u-boot-fix-build-python-3.10.patch
delete mode 100644 gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch
delete mode 100644 gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch
create mode 100644 gnu/system/images/orangepi-r1-plus-lts-rk3328.scm
base-commit: fc6bdaad57bf91609849623c5f485403c030cb49
--
2.41.0
^ permalink raw reply [flat|nested] 13+ messages in thread
* [bug#67261] [PATCH 1/3] gnu: u-boot: Update to 2023.10.
2023-11-18 15:38 [bug#67261] [PATCH 0/3] Update u-boot to 2023.10 Herman Rimm via Guix-patches via
@ 2023-11-18 16:01 ` Herman Rimm via Guix-patches via
2023-11-24 21:23 ` Vagrant Cascadian
2023-11-18 16:01 ` [bug#67261] [PATCH 2/3] gnu: bootloader: Add orangepi-r1-plus-lts-rk3328 bootloader Herman Rimm via Guix-patches via
` (3 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Herman Rimm via Guix-patches via @ 2023-11-18 16:01 UTC (permalink / raw)
To: 67261; +Cc: Herman Rimm, Efraim Flashner, Vagrant Cascadian
* gnu/local.mk: De-register patches.
* gnu/packages/bootloaders.scm (u-boot): Update to 2023.10.
[source]: Remove patches.
* gnu/packages/patches/u-boot-allow-disabling-openssl.patch: Refresh.
* gnu/packages/patches/u-boot-fix-build-python-3.10.patch: Delete file.
* gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch: Delete file.
* gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch: Delete file.
* gnu/packages/patches/u-boot-rockchip-inno-usb.patch: Refresh.
---
gnu/local.mk | 4 +-
gnu/packages/bootloaders.scm | 14 +----
.../u-boot-allow-disabling-openssl.patch | 56 ++++++++++---------
.../u-boot-fix-build-python-3.10.patch | 37 ------------
.../patches/u-boot-fix-u-boot-lib-build.patch | 24 --------
.../u-boot-rk3399-enable-emmc-phy.patch | 26 ---------
.../patches/u-boot-rockchip-inno-usb.patch | 16 +++---
7 files changed, 42 insertions(+), 135 deletions(-)
delete mode 100644 gnu/packages/patches/u-boot-fix-build-python-3.10.patch
delete mode 100644 gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch
delete mode 100644 gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index fcd9024ce3..84fcb9c54e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -61,6 +61,7 @@
# Copyright © 2023 Andy Tai <atai@atai.org>
# Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
# Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+# Copyright © 2023 Herman Rimm <herman@rimm.ee>
#
# This file is part of GNU Guix.
#
@@ -2056,13 +2057,10 @@ dist_patch_DATA = \
%D%/packages/patches/tuxpaint-stamps-path.patch \
%D%/packages/patches/twinkle-bcg729.patch \
%D%/packages/patches/u-boot-allow-disabling-openssl.patch \
- %D%/packages/patches/u-boot-fix-build-python-3.10.patch \
- %D%/packages/patches/u-boot-fix-u-boot-lib-build.patch \
%D%/packages/patches/u-boot-nintendo-nes-serial.patch \
%D%/packages/patches/u-boot-patman-change-id.patch \
%D%/packages/patches/u-boot-rockchip-inno-usb.patch \
%D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \
- %D%/packages/patches/u-boot-rk3399-enable-emmc-phy.patch \
%D%/packages/patches/ucx-tcp-iface-ioctl.patch \
%D%/packages/patches/ultrastar-deluxe-no-freesans.patch \
%D%/packages/patches/ungoogled-chromium-extension-search-path.patch \
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index fb20ba0efa..5da696388a 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -18,6 +18,7 @@
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2021 Stefan <stefan-guix@vodafonemail.de>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2023 Herman Rimm <herman@rimm.ee>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -637,24 +638,15 @@ (define %u-boot-allow-disabling-openssl-patch
;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html
(search-patch "u-boot-allow-disabling-openssl.patch"))
-(define %u-boot-rk3399-enable-emmc-phy-patch
- ;; Fix emmc boot on rockpro64 and pinebook-pro, this was a regression
- ;; therefore should hopefully be fixed when updating u-boot.
- ;; https://lists.denx.de/pipermail/u-boot/2021-November/466329.html
- (search-patch "u-boot-rk3399-enable-emmc-phy.patch"))
-
(define u-boot
(package
(name "u-boot")
- (version "2023.07.02")
+ (version "2023.10")
(source (origin
(patches
(list %u-boot-rockchip-inno-usb-patch
%u-boot-allow-disabling-openssl-patch
%u-boot-sifive-prevent-relocating-initrd-fdt
- %u-boot-rk3399-enable-emmc-phy-patch
- (search-patch "u-boot-fix-build-python-3.10.patch")
- (search-patch "u-boot-fix-u-boot-lib-build.patch")
(search-patch "u-boot-patman-change-id.patch")))
(method url-fetch)
(uri (string-append
@@ -662,7 +654,7 @@ (define u-boot
"u-boot-" version ".tar.bz2"))
(sha256
(base32
- "1m91w3fpywllkwm000dqsw3294j0szs1lz6qbgwv1aql3ic4hskb"))))
+ "0039rravvjq9yi41645fynycw4c869px024xfc0n212f05pnq3p0"))))
(build-system gnu-build-system)
(native-inputs
(list bison
diff --git a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch b/gnu/packages/patches/u-boot-allow-disabling-openssl.patch
index 5195a7a6f8..708ed81e93 100644
--- a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch
+++ b/gnu/packages/patches/u-boot-allow-disabling-openssl.patch
@@ -8,8 +8,10 @@ This reverts commit b4f3cc2c42d97967a3a3c8796c340f6b07ecccac.
Addendum 2022-12-08, Ricardo Wurmus: This patch has been updated to introduce
CONFIG_FIT_PRELOAD to remove fit_pre_load_data, which depends on openssl.
+Addendum 2023-10-17, Herman Rimm: Update patch for u-boot v2023.10.
+
diff --git a/tools/kwbimage.c b/tools/kwbimage.c
-index 94b7685392..eec599b0ee 100644
+index 4dce495ff0..976174ae77 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -19,6 +19,7 @@
@@ -38,7 +40,7 @@ index 94b7685392..eec599b0ee 100644
struct boot_mode {
unsigned int id;
-@@ -278,6 +282,8 @@ image_count_options(unsigned int optiontype)
+@@ -281,6 +285,8 @@ image_count_options(unsigned int optiontype)
return count;
}
@@ -47,7 +49,7 @@ index 94b7685392..eec599b0ee 100644
static int image_get_csk_index(void)
{
struct image_cfg_element *e;
-@@ -288,6 +294,7 @@ static int image_get_csk_index(void)
+@@ -291,6 +297,7 @@ static int image_get_csk_index(void)
return e->csk_idx;
}
@@ -55,7 +57,7 @@ index 94b7685392..eec599b0ee 100644
static bool image_get_spezialized_img(void)
{
-@@ -432,6 +439,7 @@ static uint8_t baudrate_to_option(unsigned int baudrate)
+@@ -435,6 +442,7 @@ static uint8_t baudrate_to_option(unsigned int baudrate)
}
}
@@ -63,29 +65,31 @@ index 94b7685392..eec599b0ee 100644
static void kwb_msg(const char *fmt, ...)
{
if (verbose_mode) {
-@@ -926,6 +934,7 @@ static int kwb_dump_fuse_cmds(struct secure_hdr_v1 *sec_hdr)
+@@ -929,6 +937,7 @@ static int kwb_dump_fuse_cmds(struct secure_hdr_v1 *sec_hdr)
done:
return ret;
}
+#endif
- static size_t image_headersz_align(size_t headersz, uint8_t blockid)
+ static int image_fill_xip_header(void *image, struct image_tool_params *params)
{
-@@ -1079,11 +1088,13 @@ static size_t image_headersz_v1(int *hasext)
- */
- headersz = sizeof(struct main_hdr_v1);
+@@ -1149,13 +1158,13 @@ static size_t image_headersz_v1(int *hasext)
+ int ret;
+ headersz = sizeof(struct main_hdr_v1);
+-
+#if defined(CONFIG_KWB_SECURE)
if (image_get_csk_index() >= 0) {
headersz += sizeof(struct secure_hdr_v1);
if (hasext)
*hasext = 1;
}
+-
+#endif
-
cpu_sheeva = image_is_cpu_sheeva();
-@@ -1270,6 +1281,7 @@ err_close:
+ count = 0;
+@@ -1351,6 +1360,7 @@ err_close:
return -1;
}
@@ -93,7 +97,7 @@ index 94b7685392..eec599b0ee 100644
static int export_pub_kak_hash(RSA *kak, struct secure_hdr_v1 *secure_hdr)
{
FILE *hashf;
-@@ -1382,6 +1394,7 @@ static int add_secure_header_v1(struct image_tool_params *params, uint8_t *ptr,
+@@ -1458,6 +1468,7 @@ static int add_secure_header_v1(struct image_tool_params *params, uint8_t *image
return 0;
}
@@ -101,9 +105,9 @@ index 94b7685392..eec599b0ee 100644
static void finish_register_set_header_v1(uint8_t **cur, uint8_t **next_ext,
struct register_set_hdr_v1 *register_set_hdr,
-@@ -1406,7 +1419,9 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
+@@ -1481,7 +1492,9 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params,
+ struct image_cfg_element *e;
struct main_hdr_v1 *main_hdr;
- struct opt_hdr_v1 *ohdr;
struct register_set_hdr_v1 *register_set_hdr;
+#if defined(CONFIG_KWB_SECURE)
struct secure_hdr_v1 *secure_hdr = NULL;
@@ -111,15 +115,16 @@ index 94b7685392..eec599b0ee 100644
size_t headersz;
uint8_t *image, *cur;
int hasext = 0;
-@@ -1491,6 +1506,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
- if (main_hdr->blockid == IBR_HDR_PEX_ID)
- main_hdr->srcaddr = cpu_to_le32(0xFFFFFFFF);
-
+@@ -1562,7 +1575,7 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params,
+ }
+ *dataoff = le32_to_cpu(main_hdr->srcaddr);
+ }
+-
+#if defined(CONFIG_KWB_SECURE)
if (image_get_csk_index() >= 0) {
/*
* only reserve the space here; we fill the header later since
-@@ -1501,7 +1517,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
+@@ -1573,7 +1586,7 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params,
*next_ext = 1;
next_ext = &secure_hdr->next;
}
@@ -128,7 +133,7 @@ index 94b7685392..eec599b0ee 100644
datai = 0;
for (cfgi = 0; cfgi < cfgn; cfgi++) {
e = &image_cfg[cfgi];
-@@ -1624,10 +1640,12 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params,
+@@ -1624,9 +1637,11 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params,
&datai, delay);
}
@@ -140,7 +145,6 @@ index 94b7685392..eec599b0ee 100644
/* Calculate and set the header checksum */
main_hdr->checksum = image_checksum8(main_hdr, headersz);
-
--- a/tools/image-host.c
+++ b/tools/image-host.c
@@ -14,8 +14,10 @@
@@ -154,7 +158,7 @@ index 94b7685392..eec599b0ee 100644
/**
* fit_set_hash_value - set hash value in requested has node
-@@ -1116,6 +1118,7 @@
+@@ -1119,6 +1121,7 @@ static int fit_config_add_verification_data(const char *keydir,
return 0;
}
@@ -162,7 +166,7 @@ index 94b7685392..eec599b0ee 100644
/*
* 0) open file (open)
* 1) read certificate (PEM_read_X509)
-@@ -1224,6 +1227,7 @@
+@@ -1227,6 +1230,7 @@ int fit_pre_load_data(const char *keydir, void *keydest, void *fit)
out:
return ret;
}
@@ -172,7 +176,7 @@ index 94b7685392..eec599b0ee 100644
const char *comment, int require_keys,
--- a/tools/fit_image.c
+++ b/tools/fit_image.c
-@@ -59,9 +59,10 @@
+@@ -61,9 +61,10 @@ static int fit_add_file_data(struct image_tool_params *params, size_t size_inc,
ret = fit_set_timestamp(ptr, 0, time);
}
@@ -186,7 +190,7 @@ index 94b7685392..eec599b0ee 100644
params->comment,
--- a/include/image.h
+++ b/include/image.h
-@@ -1090,6 +1090,7 @@
+@@ -1182,6 +1182,7 @@ int fit_image_hash_get_value(const void *fit, int noffset, uint8_t **value,
int fit_set_timestamp(void *fit, int noffset, time_t timestamp);
@@ -194,7 +198,7 @@ index 94b7685392..eec599b0ee 100644
/**
* fit_pre_load_data() - add public key to fdt blob
*
-@@ -1104,6 +1105,7 @@
+@@ -1196,6 +1197,7 @@ int fit_set_timestamp(void *fit, int noffset, time_t timestamp);
* < 0, on failure
*/
int fit_pre_load_data(const char *keydir, void *keydest, void *fit);
diff --git a/gnu/packages/patches/u-boot-fix-build-python-3.10.patch b/gnu/packages/patches/u-boot-fix-build-python-3.10.patch
deleted file mode 100644
index 7e5d6ba656..0000000000
--- a/gnu/packages/patches/u-boot-fix-build-python-3.10.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-This patch is backported from U-Boot 2023.01; remove when updating.
-
-From 7d01bb1c5a1daef0187c9ea276bde19a8d0e7fde Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <msuchanek@suse.de>
-Date: Thu, 13 Oct 2022 22:43:41 +0200
-Subject: [PATCH] libfdt: Fix build with python 3.10
-
-Python 3.10 requires defining PY_SSIZE_T_CLEAN. This will be fixed in
-swig 4.10 but it is not clear when it will be released. There was a
-warning since python 3.8.
-
-Link: https://github.com/swig/swig/pull/2277
-
-Signed-off-by: Michal Suchanek <msuchanek@suse.de>
-Reviewed-by: Simon Glass <sjg@chromium.org>
----
- scripts/dtc/pylibfdt/libfdt.i_shipped | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
-index 27c29ea260..56cc5d48f4 100644
---- a/scripts/dtc/pylibfdt/libfdt.i_shipped
-+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
-@@ -7,6 +7,10 @@
-
- %module libfdt
-
-+%begin %{
-+#define PY_SSIZE_T_CLEAN
-+%}
-+
- %include <stdint.i>
-
- %{
---
-GitLab
-
diff --git a/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch b/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch
deleted file mode 100644
index 233c437de6..0000000000
--- a/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Submitted upstream (see:
-https://lists.denx.de/pipermail/u-boot/2023-July/521984.html)
-
-diff --git a/tools/u_boot_pylib/pyproject.toml b/tools/u_boot_pylib/pyproject.toml
-index 3f33caf6f8..037c5d629e 100644
---- a/tools/u_boot_pylib/pyproject.toml
-+++ b/tools/u_boot_pylib/pyproject.toml
-@@ -9,7 +9,7 @@ authors = [
- { name="Simon Glass", email="sjg@chromium.org" },
- ]
- description = "U-Boot python library"
--readme = "README.md"
-+readme = "README.rst"
- requires-python = ">=3.7"
- classifiers = [
- "Programming Language :: Python :: 3",
-@@ -20,3 +20,7 @@ classifiers = [
- [project.urls]
- "Homepage" = "https://u-boot.readthedocs.io"
- "Bug Tracker" = "https://source.denx.de/groups/u-boot/-/issues"
-+
-+[tool.setuptools.packages.find]
-+where = [".."]
-+include = ["u_boot_pylib*"]
diff --git a/gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch b/gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch
deleted file mode 100644
index f14a9ce104..0000000000
--- a/gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-adapting commit ac804143cf ("mmc: rockchip_sdhci: add phy and clock
-config for rk3399") to fix the issue "Not found emmc phy device".
-
-Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
----
-
- arch/arm/dts/rk3399-u-boot.dtsi | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
-index 73922c328a..716b9a433a 100644
---- a/arch/arm/dts/rk3399-u-boot.dtsi
-+++ b/arch/arm/dts/rk3399-u-boot.dtsi
-@@ -88,6 +88,10 @@
- u-boot,dm-pre-reloc;
- };
-
-+&emmc_phy {
-+ u-boot,dm-pre-reloc;
-+};
-+
- &grf {
- u-boot,dm-pre-reloc;
- };
---
-2.17.1
diff --git a/gnu/packages/patches/u-boot-rockchip-inno-usb.patch b/gnu/packages/patches/u-boot-rockchip-inno-usb.patch
index 58f04b2c78..eeb25f4b89 100644
--- a/gnu/packages/patches/u-boot-rockchip-inno-usb.patch
+++ b/gnu/packages/patches/u-boot-rockchip-inno-usb.patch
@@ -170,10 +170,10 @@ Tested-by: Peter Robinson <pbrobinson@gmail.com>
1 file changed, 21 insertions(+)
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
-index 62b8ba3a4a..be9cc99d90 100644
+index 70e61eccb7..ce36db94a7 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
-@@ -62,6 +62,8 @@ struct rockchip_usb2phy {
+@@ -64,6 +64,8 @@ struct rockchip_usb2phy {
void *reg_base;
struct clk phyclk;
const struct rockchip_usb2phy_cfg *phy_cfg;
@@ -182,7 +182,7 @@ index 62b8ba3a4a..be9cc99d90 100644
};
static inline int property_enable(void *reg_base,
-@@ -92,6 +94,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy)
+@@ -106,6 +108,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy)
struct rockchip_usb2phy *priv = dev_get_priv(parent);
const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy);
@@ -193,7 +193,7 @@ index 62b8ba3a4a..be9cc99d90 100644
property_enable(priv->reg_base, &port_cfg->phy_sus, false);
/* waiting for the utmi_clk to become stable */
-@@ -106,6 +112,10 @@ static int rockchip_usb2phy_power_off(struct phy *phy)
+@@ -120,6 +126,10 @@ static int rockchip_usb2phy_power_off(struct phy *phy)
struct rockchip_usb2phy *priv = dev_get_priv(parent);
const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy);
@@ -204,7 +204,7 @@ index 62b8ba3a4a..be9cc99d90 100644
property_enable(priv->reg_base, &port_cfg->phy_sus, true);
return 0;
-@@ -118,6 +128,10 @@ static int rockchip_usb2phy_init(struct phy *phy)
+@@ -132,6 +142,10 @@ static int rockchip_usb2phy_init(struct phy *phy)
const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy);
int ret;
@@ -213,9 +213,9 @@ index 62b8ba3a4a..be9cc99d90 100644
+ return 0;
+
ret = clk_enable(&priv->phyclk);
- if (ret) {
+ if (ret && ret != -ENOSYS) {
dev_err(phy->dev, "failed to enable phyclk (ret=%d)\n", ret);
-@@ -140,6 +154,10 @@ static int rockchip_usb2phy_exit(struct phy *phy)
+@@ -154,6 +168,10 @@ static int rockchip_usb2phy_exit(struct phy *phy)
struct udevice *parent = dev_get_parent(phy->dev);
struct rockchip_usb2phy *priv = dev_get_priv(parent);
@@ -226,7 +226,7 @@ index 62b8ba3a4a..be9cc99d90 100644
clk_disable(&priv->phyclk);
return 0;
-@@ -212,6 +230,9 @@ static int rockchip_usb2phy_probe(struct udevice *dev)
+@@ -294,6 +312,9 @@ static int rockchip_usb2phy_probe(struct udevice *dev)
return ret;
}
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#67261] [PATCH 2/3] gnu: bootloader: Add orangepi-r1-plus-lts-rk3328 bootloader.
2023-11-18 15:38 [bug#67261] [PATCH 0/3] Update u-boot to 2023.10 Herman Rimm via Guix-patches via
2023-11-18 16:01 ` [bug#67261] [PATCH 1/3] gnu: u-boot: Update " Herman Rimm via Guix-patches via
@ 2023-11-18 16:01 ` Herman Rimm via Guix-patches via
2023-12-01 19:50 ` Vagrant Cascadian
2023-11-18 16:01 ` [bug#67261] [PATCH 3/3] images: Add orangepi-r1-plus-lts image Herman Rimm via Guix-patches via
` (2 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Herman Rimm via Guix-patches via @ 2023-11-18 16:01 UTC (permalink / raw)
To: 67261; +Cc: Herman Rimm, Efraim Flashner, Vagrant Cascadian
* gnu/bootloader/u-boot.scm (install-orangepi-r1-plus-lts-rk3328-u-boot,
u-boot-orangepi-r1-plus-lts-rk3328-bootloader): New variables.
* gnu/packages/bootloaders.scm (u-boot-orangepi-r1-plus-lts-rk3328): New
variable.
---
gnu/bootloader/u-boot.scm | 17 +++++++++++++++++
gnu/packages/bootloaders.scm | 15 +++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm
index 712db15b02..d20aabd538 100644
--- a/gnu/bootloader/u-boot.scm
+++ b/gnu/bootloader/u-boot.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2023 Herman Rimm <herman_rimm@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +38,7 @@ (define-module (gnu bootloader u-boot)
u-boot-mx6cuboxi-bootloader
u-boot-nintendo-nes-classic-edition-bootloader
u-boot-novena-bootloader
+ u-boot-orangepi-r1-plus-lts-rk3328-bootloader
u-boot-pine64-plus-bootloader
u-boot-pine64-lts-bootloader
u-boot-pinebook-bootloader
@@ -93,6 +95,15 @@ (define install-imx-u-boot
(write-file-on-device u-boot (stat:size (stat u-boot))
image (* 69 1024)))))
+(define install-orangepi-r1-plus-lts-rk3328-u-boot
+ #~(lambda (bootloader root-index image)
+ (let ((idb (string-append bootloader "/libexec/idbloader.img"))
+ (u-boot (string-append bootloader "/libexec/u-boot.itb")))
+ (write-file-on-device idb (stat:size (stat idb))
+ image (* 64 512))
+ (write-file-on-device u-boot (stat:size (stat u-boot))
+ image (* 16384 512)))))
+
(define install-puma-rk3399-u-boot
#~(lambda (bootloader root-index image)
(let ((spl (string-append bootloader "/libexec/idbloader.img"))
@@ -233,6 +244,12 @@ (define u-boot-novena-bootloader
(inherit u-boot-imx-bootloader)
(package u-boot-novena)))
+(define u-boot-orangepi-r1-plus-lts-rk3328-bootloader
+ (bootloader
+ (inherit u-boot-bootloader)
+ (package u-boot-orangepi-r1-plus-lts-rk3328)
+ (disk-image-installer install-orangepi-r1-plus-lts-rk3328-u-boot)))
+
(define u-boot-pine64-plus-bootloader
(bootloader
(inherit u-boot-allwinner64-bootloader)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 5da696388a..e88abe2dec 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1128,6 +1128,21 @@ (define-public u-boot-novena
version, contrary to Novena upstream, does not load u-boot.img from the first
partition."))
+(define-public u-boot-orangepi-r1-plus-lts-rk3328
+ (let ((base (make-u-boot-package "orangepi-r1-plus-lts-rk3328" "aarch64-linux-gnu")))
+ (package
+ (inherit base)
+ (arguments
+ (substitute-keyword-arguments (package-arguments base)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'set-environment
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (setenv "BL31" (search-input-file inputs "bl31.elf"))))))))
+ (inputs
+ (modify-inputs (package-inputs base)
+ (append arm-trusted-firmware-rk3328))))))
+
(define-public u-boot-cubieboard
(make-u-boot-package "Cubieboard" "arm-linux-gnueabihf"))
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#67261] [PATCH 3/3] images: Add orangepi-r1-plus-lts image.
2023-11-18 15:38 [bug#67261] [PATCH 0/3] Update u-boot to 2023.10 Herman Rimm via Guix-patches via
2023-11-18 16:01 ` [bug#67261] [PATCH 1/3] gnu: u-boot: Update " Herman Rimm via Guix-patches via
2023-11-18 16:01 ` [bug#67261] [PATCH 2/3] gnu: bootloader: Add orangepi-r1-plus-lts-rk3328 bootloader Herman Rimm via Guix-patches via
@ 2023-11-18 16:01 ` Herman Rimm via Guix-patches via
2023-12-01 19:58 ` Vagrant Cascadian
2023-11-27 8:33 ` [bug#67261] [PATCH v2] gnu: u-boot: Update to 2023.10 Herman Rimm via Guix-patches via
2023-12-23 0:19 ` bug#67261: [PATCH 0/3] Update u-boot " Vagrant Cascadian
4 siblings, 1 reply; 13+ messages in thread
From: Herman Rimm via Guix-patches via @ 2023-11-18 16:01 UTC (permalink / raw)
To: 67261; +Cc: Herman Rimm
* gnu/local.mk: Register image.
* gnu/system/images/orangepi-r1-plus-lts-rk3328.scm: New file.
* gnu/system/install.scm (orangepi-r1-plus-lts-rk3328-installation-os):
New variable.
---
gnu/local.mk | 1 +
.../images/orangepi-r1-plus-lts-rk3328.scm | 76 +++++++++++++++++++
gnu/system/install.scm | 7 ++
3 files changed, 84 insertions(+)
create mode 100644 gnu/system/images/orangepi-r1-plus-lts-rk3328.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 84fcb9c54e..428dc20969 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -749,6 +749,7 @@ GNU_SYSTEM_MODULES = \
\
%D%/system/images/hurd.scm \
%D%/system/images/novena.scm \
+ %D%/system/images/orangepi-r1-plus-lts-rk3328.scm \
%D%/system/images/pine64.scm \
%D%/system/images/pinebook-pro.scm \
%D%/system/images/rock64.scm \
diff --git a/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm b/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm
new file mode 100644
index 0000000000..eaaa12ba78
--- /dev/null
+++ b/gnu/system/images/orangepi-r1-plus-lts-rk3328.scm
@@ -0,0 +1,76 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Herman Rimm <herman@rimm.ee>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu system images orangepi-r1-plus-lts-rk3328)
+ #:use-module (gnu bootloader)
+ #:use-module (gnu bootloader u-boot)
+ #:use-module (gnu image)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages certs)
+ #:use-module (guix platforms arm)
+ #:use-module (gnu services)
+ #:use-module (gnu services base)
+ #:use-module (gnu services networking)
+ #:use-module (gnu system)
+ #:use-module (gnu system file-systems)
+ #:use-module (gnu system image)
+ #:use-module (srfi srfi-26)
+ #:export (orangepi-r1-plus-lts-rk3328-barebones-os
+ orangepi-r1-plus-lts-rk3328-image-type
+ orangepi-r1-plus-lts-rk3328-barebones-raw-image))
+
+(define orangepi-r1-plus-lts-rk3328-barebones-os
+ (operating-system
+ (host-name "windmolen")
+ (timezone "Europe/Amsterdam")
+ (locale "en_US.utf8")
+ (bootloader (bootloader-configuration
+ (bootloader u-boot-orangepi-r1-plus-lts-rk3328-bootloader)
+ (targets '("/dev/mmcblk0"))))
+ (initrd-modules '())
+ (kernel linux-libre-arm64-generic)
+ (file-systems (cons (file-system
+ (device (file-system-label "my-root"))
+ (mount-point "/")
+ (type "ext4")) %base-file-systems))
+ (services
+ (cons* (service agetty-service-type
+ (agetty-configuration (extra-options '("-L")) ;no carrier detect
+ (baud-rate "1500000")
+ (term "vt100")
+ (tty "ttyS2")))
+ (service dhcp-client-service-type)
+ (service ntp-service-type) %base-services))
+ (packages (cons nss-certs %base-packages))))
+
+(define orangepi-r1-plus-lts-rk3328-image-type
+ (image-type (name 'orangepi-r1-plus-lts-rk3328-raw)
+ (constructor (lambda (os)
+ (image (inherit (raw-with-offset-disk-image (expt
+ 2 24)))
+ (operating-system
+ os)
+ (platform aarch64-linux))))))
+
+(define orangepi-r1-plus-lts-rk3328-barebones-raw-image
+ (image (inherit (os+platform->image orangepi-r1-plus-lts-rk3328-barebones-os
+ aarch64-linux
+ #:type orangepi-r1-plus-lts-rk3328-image-type))
+ (name 'orangepi-r1-plus-lts-rk3328-barebones-raw-image)))
+
+orangepi-r1-plus-lts-rk3328-barebones-raw-image
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 28161de153..03d2b0b2f4 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2022 Josselin Poiret <dev@jpoiret.xyz>
+;;; Copyright © 2023 Herman Rimm <herman@rimm.ee>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -69,6 +70,7 @@ (define-module (gnu system install)
mx6cuboxi-installation-os
nintendo-nes-classic-edition-installation-os
novena-installation-os
+ orangepi-r1-plus-lts-rk3328-installation-os
firefly-rk3399-installation-os
pine64-plus-installation-os
pinebook-installation-os
@@ -633,6 +635,11 @@ (define nintendo-nes-classic-edition-installation-os
"/dev/mmcblk0" ; SD card (solder it yourself)
"ttyS0"))
+(define orangepi-r1-plus-lts-rk3328-installation-os
+ (embedded-installation-os u-boot-orangepi-r1-plus-lts-rk3328-bootloader
+ "/dev/mmcblk0" ; SD card storage
+ "ttyS0"))
+
(define pine64-plus-installation-os
(embedded-installation-os u-boot-pine64-plus-bootloader
"/dev/mmcblk0" ; SD card storage
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#67261] [PATCH 1/3] gnu: u-boot: Update to 2023.10.
2023-11-18 16:01 ` [bug#67261] [PATCH 1/3] gnu: u-boot: Update " Herman Rimm via Guix-patches via
@ 2023-11-24 21:23 ` Vagrant Cascadian
0 siblings, 0 replies; 13+ messages in thread
From: Vagrant Cascadian @ 2023-11-24 21:23 UTC (permalink / raw)
To: Herman Rimm, 67261
Cc: Maxim Cournoyer, Munyoki Kilyungi, Lars-Dominik Braun,
Efraim Flashner, jgart, Marius Bakke
[-- Attachment #1: Type: text/plain, Size: 1579 bytes --]
On 2023-11-18, Herman Rimm wrote:
> * gnu/local.mk: De-register patches.
> * gnu/packages/bootloaders.scm (u-boot): Update to 2023.10.
> [source]: Remove patches.
> * gnu/packages/patches/u-boot-allow-disabling-openssl.patch: Refresh.
> * gnu/packages/patches/u-boot-fix-build-python-3.10.patch: Delete file.
> * gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch: Delete file.
> * gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch: Delete file.
> * gnu/packages/patches/u-boot-rockchip-inno-usb.patch: Refresh.
This appears to have broken building u-boot-documentation:
starting phase `build'
HOSTCC scripts/basic/fixdep
SPHINX texinfodocs --> file:///tmp/guix-build-u-boot-documentation-2023.10.drv-0/u-boot-2023.10/doc/output/texinfo
PARSE include/linker_lists.h
Running Sphinx v5.1.1
Warning: The Sphinx 'sphinx_rtd_theme' HTML theme was not found. Make sure you have the theme installed to produce pretty HTML output. Falling back to the default theme.
Fontconfig error: No writable cache directories
Fontconfig error: No writable cache directories
Extension error:
Could not import extension sphinx-prompt (exception: No module named 'sphinx-prompt')
make[1]: *** [doc/Makefile:73: texinfodocs] Error 2
make: *** [Makefile:2380: infodocs] Error 2
I tried adding python-sphinx-rtd-theme and python-sphinx-prompt, but
unfortunately python-sphinx-prompt does not build.
CCing members of the python team and Maxim Cournoyer who originally
added u-boot-documentation.
live well,
vagrant
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* [bug#67261] [PATCH v2] gnu: u-boot: Update to 2023.10.
2023-11-18 15:38 [bug#67261] [PATCH 0/3] Update u-boot to 2023.10 Herman Rimm via Guix-patches via
` (2 preceding siblings ...)
2023-11-18 16:01 ` [bug#67261] [PATCH 3/3] images: Add orangepi-r1-plus-lts image Herman Rimm via Guix-patches via
@ 2023-11-27 8:33 ` Herman Rimm via Guix-patches via
2023-12-01 19:48 ` Vagrant Cascadian
2023-12-23 0:19 ` bug#67261: [PATCH 0/3] Update u-boot " Vagrant Cascadian
4 siblings, 1 reply; 13+ messages in thread
From: Herman Rimm via Guix-patches via @ 2023-11-27 8:33 UTC (permalink / raw)
To: 67261; +Cc: Herman Rimm, Efraim Flashner, Vagrant Cascadian
* gnu/local.mk: De-register patches.
* gnu/packages/bootloaders.scm (u-boot): Update to 2023.10.
[source]: Remove patches.
* gnu/packages/patches/u-boot-allow-disabling-openssl.patch: Refresh.
* gnu/packages/patches/u-boot-fix-build-python-3.10.patch: Delete file.
* gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch: Delete file.
* gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch: Delete file.
* gnu/packages/patches/u-boot-rockchip-inno-usb.patch: Refresh.
* gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch:
Delete file.
---
If you would like to test u-boot v2023.10 and have a HiFive Unmatched,
please test this revision of the patch and let me know whether or not
the device still boots.
gnu/local.mk | 5 +-
gnu/packages/bootloaders.scm | 20 +------
.../u-boot-allow-disabling-openssl.patch | 56 ++++++++++---------
.../u-boot-fix-build-python-3.10.patch | 37 ------------
.../patches/u-boot-fix-u-boot-lib-build.patch | 24 --------
.../u-boot-rk3399-enable-emmc-phy.patch | 26 ---------
.../patches/u-boot-rockchip-inno-usb.patch | 16 +++---
...boot-sifive-prevent-reloc-initrd-fdt.patch | 16 ------
8 files changed, 42 insertions(+), 158 deletions(-)
delete mode 100644 gnu/packages/patches/u-boot-fix-build-python-3.10.patch
delete mode 100644 gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch
delete mode 100644 gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch
delete mode 100644 gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 023cd4b17f..0c23f71452 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -61,6 +61,7 @@
# Copyright © 2023 Andy Tai <atai@atai.org>
# Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
# Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+# Copyright © 2023 Herman Rimm <herman@rimm.ee>
#
# This file is part of GNU Guix.
#
@@ -2059,13 +2060,9 @@ dist_patch_DATA = \
%D%/packages/patches/tuxpaint-stamps-path.patch \
%D%/packages/patches/twinkle-bcg729.patch \
%D%/packages/patches/u-boot-allow-disabling-openssl.patch \
- %D%/packages/patches/u-boot-fix-build-python-3.10.patch \
- %D%/packages/patches/u-boot-fix-u-boot-lib-build.patch \
%D%/packages/patches/u-boot-nintendo-nes-serial.patch \
%D%/packages/patches/u-boot-patman-change-id.patch \
%D%/packages/patches/u-boot-rockchip-inno-usb.patch \
- %D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \
- %D%/packages/patches/u-boot-rk3399-enable-emmc-phy.patch \
%D%/packages/patches/ucx-tcp-iface-ioctl.patch \
%D%/packages/patches/ultrastar-deluxe-no-freesans.patch \
%D%/packages/patches/ungoogled-chromium-extension-search-path.patch \
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index e708641623..5e6edb143e 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -18,6 +18,7 @@
;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2021 Stefan <stefan-guix@vodafonemail.de>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2023 Herman Rimm <herman@rimm.ee>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -692,34 +693,19 @@ (define %u-boot-rockchip-inno-usb-patch
;; and https://patchwork.ozlabs.org/project/uboot/patch/20210406151059.1187379-1-icenowy@aosc.io
(search-patch "u-boot-rockchip-inno-usb.patch"))
-(define %u-boot-sifive-prevent-relocating-initrd-fdt
- ;; Fix boot in 2021.07 on Hifive unmatched, see
- ;; https://bugs.launchpad.net/ubuntu/+source/u-boot/+bug/1937246
- (search-patch "u-boot-sifive-prevent-reloc-initrd-fdt.patch"))
-
(define %u-boot-allow-disabling-openssl-patch
;; Fixes build of u-boot 2021.10 without openssl
;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html
(search-patch "u-boot-allow-disabling-openssl.patch"))
-(define %u-boot-rk3399-enable-emmc-phy-patch
- ;; Fix emmc boot on rockpro64 and pinebook-pro, this was a regression
- ;; therefore should hopefully be fixed when updating u-boot.
- ;; https://lists.denx.de/pipermail/u-boot/2021-November/466329.html
- (search-patch "u-boot-rk3399-enable-emmc-phy.patch"))
-
(define u-boot
(package
(name "u-boot")
- (version "2023.07.02")
+ (version "2023.10")
(source (origin
(patches
(list %u-boot-rockchip-inno-usb-patch
%u-boot-allow-disabling-openssl-patch
- %u-boot-sifive-prevent-relocating-initrd-fdt
- %u-boot-rk3399-enable-emmc-phy-patch
- (search-patch "u-boot-fix-build-python-3.10.patch")
- (search-patch "u-boot-fix-u-boot-lib-build.patch")
(search-patch "u-boot-patman-change-id.patch")))
(method url-fetch)
(uri (string-append
@@ -727,7 +713,7 @@ (define u-boot
"u-boot-" version ".tar.bz2"))
(sha256
(base32
- "1m91w3fpywllkwm000dqsw3294j0szs1lz6qbgwv1aql3ic4hskb"))))
+ "0039rravvjq9yi41645fynycw4c869px024xfc0n212f05pnq3p0"))))
(build-system gnu-build-system)
(native-inputs
(list bison
diff --git a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch b/gnu/packages/patches/u-boot-allow-disabling-openssl.patch
index 5195a7a6f8..708ed81e93 100644
--- a/gnu/packages/patches/u-boot-allow-disabling-openssl.patch
+++ b/gnu/packages/patches/u-boot-allow-disabling-openssl.patch
@@ -8,8 +8,10 @@ This reverts commit b4f3cc2c42d97967a3a3c8796c340f6b07ecccac.
Addendum 2022-12-08, Ricardo Wurmus: This patch has been updated to introduce
CONFIG_FIT_PRELOAD to remove fit_pre_load_data, which depends on openssl.
+Addendum 2023-10-17, Herman Rimm: Update patch for u-boot v2023.10.
+
diff --git a/tools/kwbimage.c b/tools/kwbimage.c
-index 94b7685392..eec599b0ee 100644
+index 4dce495ff0..976174ae77 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -19,6 +19,7 @@
@@ -38,7 +40,7 @@ index 94b7685392..eec599b0ee 100644
struct boot_mode {
unsigned int id;
-@@ -278,6 +282,8 @@ image_count_options(unsigned int optiontype)
+@@ -281,6 +285,8 @@ image_count_options(unsigned int optiontype)
return count;
}
@@ -47,7 +49,7 @@ index 94b7685392..eec599b0ee 100644
static int image_get_csk_index(void)
{
struct image_cfg_element *e;
-@@ -288,6 +294,7 @@ static int image_get_csk_index(void)
+@@ -291,6 +297,7 @@ static int image_get_csk_index(void)
return e->csk_idx;
}
@@ -55,7 +57,7 @@ index 94b7685392..eec599b0ee 100644
static bool image_get_spezialized_img(void)
{
-@@ -432,6 +439,7 @@ static uint8_t baudrate_to_option(unsigned int baudrate)
+@@ -435,6 +442,7 @@ static uint8_t baudrate_to_option(unsigned int baudrate)
}
}
@@ -63,29 +65,31 @@ index 94b7685392..eec599b0ee 100644
static void kwb_msg(const char *fmt, ...)
{
if (verbose_mode) {
-@@ -926,6 +934,7 @@ static int kwb_dump_fuse_cmds(struct secure_hdr_v1 *sec_hdr)
+@@ -929,6 +937,7 @@ static int kwb_dump_fuse_cmds(struct secure_hdr_v1 *sec_hdr)
done:
return ret;
}
+#endif
- static size_t image_headersz_align(size_t headersz, uint8_t blockid)
+ static int image_fill_xip_header(void *image, struct image_tool_params *params)
{
-@@ -1079,11 +1088,13 @@ static size_t image_headersz_v1(int *hasext)
- */
- headersz = sizeof(struct main_hdr_v1);
+@@ -1149,13 +1158,13 @@ static size_t image_headersz_v1(int *hasext)
+ int ret;
+ headersz = sizeof(struct main_hdr_v1);
+-
+#if defined(CONFIG_KWB_SECURE)
if (image_get_csk_index() >= 0) {
headersz += sizeof(struct secure_hdr_v1);
if (hasext)
*hasext = 1;
}
+-
+#endif
-
cpu_sheeva = image_is_cpu_sheeva();
-@@ -1270,6 +1281,7 @@ err_close:
+ count = 0;
+@@ -1351,6 +1360,7 @@ err_close:
return -1;
}
@@ -93,7 +97,7 @@ index 94b7685392..eec599b0ee 100644
static int export_pub_kak_hash(RSA *kak, struct secure_hdr_v1 *secure_hdr)
{
FILE *hashf;
-@@ -1382,6 +1394,7 @@ static int add_secure_header_v1(struct image_tool_params *params, uint8_t *ptr,
+@@ -1458,6 +1468,7 @@ static int add_secure_header_v1(struct image_tool_params *params, uint8_t *image
return 0;
}
@@ -101,9 +105,9 @@ index 94b7685392..eec599b0ee 100644
static void finish_register_set_header_v1(uint8_t **cur, uint8_t **next_ext,
struct register_set_hdr_v1 *register_set_hdr,
-@@ -1406,7 +1419,9 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
+@@ -1481,7 +1492,9 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params,
+ struct image_cfg_element *e;
struct main_hdr_v1 *main_hdr;
- struct opt_hdr_v1 *ohdr;
struct register_set_hdr_v1 *register_set_hdr;
+#if defined(CONFIG_KWB_SECURE)
struct secure_hdr_v1 *secure_hdr = NULL;
@@ -111,15 +115,16 @@ index 94b7685392..eec599b0ee 100644
size_t headersz;
uint8_t *image, *cur;
int hasext = 0;
-@@ -1491,6 +1506,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
- if (main_hdr->blockid == IBR_HDR_PEX_ID)
- main_hdr->srcaddr = cpu_to_le32(0xFFFFFFFF);
-
+@@ -1562,7 +1575,7 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params,
+ }
+ *dataoff = le32_to_cpu(main_hdr->srcaddr);
+ }
+-
+#if defined(CONFIG_KWB_SECURE)
if (image_get_csk_index() >= 0) {
/*
* only reserve the space here; we fill the header later since
-@@ -1501,7 +1517,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
+@@ -1573,7 +1586,7 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params,
*next_ext = 1;
next_ext = &secure_hdr->next;
}
@@ -128,7 +133,7 @@ index 94b7685392..eec599b0ee 100644
datai = 0;
for (cfgi = 0; cfgi < cfgn; cfgi++) {
e = &image_cfg[cfgi];
-@@ -1624,10 +1640,12 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params,
+@@ -1624,9 +1637,11 @@ static void *image_create_v1(size_t *dataoff, struct image_tool_params *params,
&datai, delay);
}
@@ -140,7 +145,6 @@ index 94b7685392..eec599b0ee 100644
/* Calculate and set the header checksum */
main_hdr->checksum = image_checksum8(main_hdr, headersz);
-
--- a/tools/image-host.c
+++ b/tools/image-host.c
@@ -14,8 +14,10 @@
@@ -154,7 +158,7 @@ index 94b7685392..eec599b0ee 100644
/**
* fit_set_hash_value - set hash value in requested has node
-@@ -1116,6 +1118,7 @@
+@@ -1119,6 +1121,7 @@ static int fit_config_add_verification_data(const char *keydir,
return 0;
}
@@ -162,7 +166,7 @@ index 94b7685392..eec599b0ee 100644
/*
* 0) open file (open)
* 1) read certificate (PEM_read_X509)
-@@ -1224,6 +1227,7 @@
+@@ -1227,6 +1230,7 @@ int fit_pre_load_data(const char *keydir, void *keydest, void *fit)
out:
return ret;
}
@@ -172,7 +176,7 @@ index 94b7685392..eec599b0ee 100644
const char *comment, int require_keys,
--- a/tools/fit_image.c
+++ b/tools/fit_image.c
-@@ -59,9 +59,10 @@
+@@ -61,9 +61,10 @@ static int fit_add_file_data(struct image_tool_params *params, size_t size_inc,
ret = fit_set_timestamp(ptr, 0, time);
}
@@ -186,7 +190,7 @@ index 94b7685392..eec599b0ee 100644
params->comment,
--- a/include/image.h
+++ b/include/image.h
-@@ -1090,6 +1090,7 @@
+@@ -1182,6 +1182,7 @@ int fit_image_hash_get_value(const void *fit, int noffset, uint8_t **value,
int fit_set_timestamp(void *fit, int noffset, time_t timestamp);
@@ -194,7 +198,7 @@ index 94b7685392..eec599b0ee 100644
/**
* fit_pre_load_data() - add public key to fdt blob
*
-@@ -1104,6 +1105,7 @@
+@@ -1196,6 +1197,7 @@ int fit_set_timestamp(void *fit, int noffset, time_t timestamp);
* < 0, on failure
*/
int fit_pre_load_data(const char *keydir, void *keydest, void *fit);
diff --git a/gnu/packages/patches/u-boot-fix-build-python-3.10.patch b/gnu/packages/patches/u-boot-fix-build-python-3.10.patch
deleted file mode 100644
index 7e5d6ba656..0000000000
--- a/gnu/packages/patches/u-boot-fix-build-python-3.10.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-This patch is backported from U-Boot 2023.01; remove when updating.
-
-From 7d01bb1c5a1daef0187c9ea276bde19a8d0e7fde Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <msuchanek@suse.de>
-Date: Thu, 13 Oct 2022 22:43:41 +0200
-Subject: [PATCH] libfdt: Fix build with python 3.10
-
-Python 3.10 requires defining PY_SSIZE_T_CLEAN. This will be fixed in
-swig 4.10 but it is not clear when it will be released. There was a
-warning since python 3.8.
-
-Link: https://github.com/swig/swig/pull/2277
-
-Signed-off-by: Michal Suchanek <msuchanek@suse.de>
-Reviewed-by: Simon Glass <sjg@chromium.org>
----
- scripts/dtc/pylibfdt/libfdt.i_shipped | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
-index 27c29ea260..56cc5d48f4 100644
---- a/scripts/dtc/pylibfdt/libfdt.i_shipped
-+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
-@@ -7,6 +7,10 @@
-
- %module libfdt
-
-+%begin %{
-+#define PY_SSIZE_T_CLEAN
-+%}
-+
- %include <stdint.i>
-
- %{
---
-GitLab
-
diff --git a/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch b/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch
deleted file mode 100644
index 233c437de6..0000000000
--- a/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Submitted upstream (see:
-https://lists.denx.de/pipermail/u-boot/2023-July/521984.html)
-
-diff --git a/tools/u_boot_pylib/pyproject.toml b/tools/u_boot_pylib/pyproject.toml
-index 3f33caf6f8..037c5d629e 100644
---- a/tools/u_boot_pylib/pyproject.toml
-+++ b/tools/u_boot_pylib/pyproject.toml
-@@ -9,7 +9,7 @@ authors = [
- { name="Simon Glass", email="sjg@chromium.org" },
- ]
- description = "U-Boot python library"
--readme = "README.md"
-+readme = "README.rst"
- requires-python = ">=3.7"
- classifiers = [
- "Programming Language :: Python :: 3",
-@@ -20,3 +20,7 @@ classifiers = [
- [project.urls]
- "Homepage" = "https://u-boot.readthedocs.io"
- "Bug Tracker" = "https://source.denx.de/groups/u-boot/-/issues"
-+
-+[tool.setuptools.packages.find]
-+where = [".."]
-+include = ["u_boot_pylib*"]
diff --git a/gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch b/gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch
deleted file mode 100644
index f14a9ce104..0000000000
--- a/gnu/packages/patches/u-boot-rk3399-enable-emmc-phy.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-adapting commit ac804143cf ("mmc: rockchip_sdhci: add phy and clock
-config for rk3399") to fix the issue "Not found emmc phy device".
-
-Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
----
-
- arch/arm/dts/rk3399-u-boot.dtsi | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
-index 73922c328a..716b9a433a 100644
---- a/arch/arm/dts/rk3399-u-boot.dtsi
-+++ b/arch/arm/dts/rk3399-u-boot.dtsi
-@@ -88,6 +88,10 @@
- u-boot,dm-pre-reloc;
- };
-
-+&emmc_phy {
-+ u-boot,dm-pre-reloc;
-+};
-+
- &grf {
- u-boot,dm-pre-reloc;
- };
---
-2.17.1
diff --git a/gnu/packages/patches/u-boot-rockchip-inno-usb.patch b/gnu/packages/patches/u-boot-rockchip-inno-usb.patch
index 58f04b2c78..eeb25f4b89 100644
--- a/gnu/packages/patches/u-boot-rockchip-inno-usb.patch
+++ b/gnu/packages/patches/u-boot-rockchip-inno-usb.patch
@@ -170,10 +170,10 @@ Tested-by: Peter Robinson <pbrobinson@gmail.com>
1 file changed, 21 insertions(+)
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
-index 62b8ba3a4a..be9cc99d90 100644
+index 70e61eccb7..ce36db94a7 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
-@@ -62,6 +62,8 @@ struct rockchip_usb2phy {
+@@ -64,6 +64,8 @@ struct rockchip_usb2phy {
void *reg_base;
struct clk phyclk;
const struct rockchip_usb2phy_cfg *phy_cfg;
@@ -182,7 +182,7 @@ index 62b8ba3a4a..be9cc99d90 100644
};
static inline int property_enable(void *reg_base,
-@@ -92,6 +94,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy)
+@@ -106,6 +108,10 @@ static int rockchip_usb2phy_power_on(struct phy *phy)
struct rockchip_usb2phy *priv = dev_get_priv(parent);
const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy);
@@ -193,7 +193,7 @@ index 62b8ba3a4a..be9cc99d90 100644
property_enable(priv->reg_base, &port_cfg->phy_sus, false);
/* waiting for the utmi_clk to become stable */
-@@ -106,6 +112,10 @@ static int rockchip_usb2phy_power_off(struct phy *phy)
+@@ -120,6 +126,10 @@ static int rockchip_usb2phy_power_off(struct phy *phy)
struct rockchip_usb2phy *priv = dev_get_priv(parent);
const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy);
@@ -204,7 +204,7 @@ index 62b8ba3a4a..be9cc99d90 100644
property_enable(priv->reg_base, &port_cfg->phy_sus, true);
return 0;
-@@ -118,6 +128,10 @@ static int rockchip_usb2phy_init(struct phy *phy)
+@@ -132,6 +142,10 @@ static int rockchip_usb2phy_init(struct phy *phy)
const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy);
int ret;
@@ -213,9 +213,9 @@ index 62b8ba3a4a..be9cc99d90 100644
+ return 0;
+
ret = clk_enable(&priv->phyclk);
- if (ret) {
+ if (ret && ret != -ENOSYS) {
dev_err(phy->dev, "failed to enable phyclk (ret=%d)\n", ret);
-@@ -140,6 +154,10 @@ static int rockchip_usb2phy_exit(struct phy *phy)
+@@ -154,6 +168,10 @@ static int rockchip_usb2phy_exit(struct phy *phy)
struct udevice *parent = dev_get_parent(phy->dev);
struct rockchip_usb2phy *priv = dev_get_priv(parent);
@@ -226,7 +226,7 @@ index 62b8ba3a4a..be9cc99d90 100644
clk_disable(&priv->phyclk);
return 0;
-@@ -212,6 +230,9 @@ static int rockchip_usb2phy_probe(struct udevice *dev)
+@@ -294,6 +312,9 @@ static int rockchip_usb2phy_probe(struct udevice *dev)
return ret;
}
diff --git a/gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch b/gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch
deleted file mode 100644
index 858f42efe7..0000000000
--- a/gnu/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: prevent relocating initrd & fdt, that results in failure to boot
-Author: Heinrich Schuchardt (xypron)
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/u-boot/+bug/1937246
-Index: u-boot-2021.07~rc4+dfsg/include/configs/sifive-unmatched.h
-===================================================================
---- u-boot-2021.07~rc4+dfsg.orig/include/configs/sifive-unmatched.h
-+++ u-boot-2021.07~rc4+dfsg/include/configs/sifive-unmatched.h
-@@ -55,6 +55,8 @@
- "name=system,size=-,bootable,type=${type_guid_gpt_system};"
-
- #define CFG_EXTRA_ENV_SETTINGS \
-+ "fdt_high=0xffffffffffffffff\0" \
-+ "initrd_high=0xffffffffffffffff\0" \
- "kernel_addr_r=0x84000000\0" \
- "kernel_comp_addr_r=0x88000000\0" \
- "kernel_comp_size=0x4000000\0" \
base-commit: 3778f778c37110460dd78088200cbd05eb0c49e4
--
2.41.0
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#67261] [PATCH v2] gnu: u-boot: Update to 2023.10.
2023-11-27 8:33 ` [bug#67261] [PATCH v2] gnu: u-boot: Update to 2023.10 Herman Rimm via Guix-patches via
@ 2023-12-01 19:48 ` Vagrant Cascadian
2023-12-02 7:11 ` Lars-Dominik Braun
0 siblings, 1 reply; 13+ messages in thread
From: Vagrant Cascadian @ 2023-12-01 19:48 UTC (permalink / raw)
To: Herman Rimm, 67261
Cc: Maxim Cournoyer, Munyoki Kilyungi, Lars-Dominik Braun,
Efraim Flashner, jgart, Marius Bakke
[-- Attachment #1: Type: text/plain, Size: 2128 bytes --]
On 2023-11-27, Herman Rimm wrote:
> If you would like to test u-boot v2023.10 and have a HiFive Unmatched,
> please test this revision of the patch and let me know whether or not
> the device still boots.
Will check booting an unmatched board; I need to do the same test to
upgrade u-boot in Debian anyways.
The main outstanding issue is that u-boot-documentation still fails to
build.
In order to get u-boot-documentation to build, I had to add
python-sphinx-prompt, and in order to get python-sphinx-prompt to build,
I needed to disable tests. Can someone from the python team take a look
at python-sphinx-prompt?
python-sphinx-rtd-theme is an optional dependency for the documentation,
but it does build without it. I am not sure how much nicer it is with or
without it. Any opinions on enabling that or using the default theme?
Applying this patch on top of v2 gets everything building for me, though
obviously disabling tests for python-sphinx-prompt is not ideal:
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 5e6edb143e..1b5e745fce 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -764,6 +764,8 @@ (define-public u-boot-documentation
(modify-inputs (package-native-inputs u-boot)
(append fontconfig
python-sphinx
+ python-sphinx-prompt
+ ; python-sphinx-rtd-theme
texinfo
which)))
(synopsis "U-Boot documentation")
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index eee1f1c4a8..020e0794ef 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -637,7 +637,8 @@ (define-public python-sphinx-prompt
(base32 "0x9wmgf04rzivbzp7jv1b7fkhkpi02lpk5w1qf4i7bcgih00ym8a"))))
(build-system python-build-system)
(arguments
- `(#:phases
+ `(#:tests? #f ; FIXME build fails without this, needed to build u-boot-documentation 2023.10+
+ #:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
live well,
vagrant
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [bug#67261] [PATCH 2/3] gnu: bootloader: Add orangepi-r1-plus-lts-rk3328 bootloader.
2023-11-18 16:01 ` [bug#67261] [PATCH 2/3] gnu: bootloader: Add orangepi-r1-plus-lts-rk3328 bootloader Herman Rimm via Guix-patches via
@ 2023-12-01 19:50 ` Vagrant Cascadian
0 siblings, 0 replies; 13+ messages in thread
From: Vagrant Cascadian @ 2023-12-01 19:50 UTC (permalink / raw)
To: Herman Rimm, 67261; +Cc: Efraim Flashner
[-- Attachment #1: Type: text/plain, Size: 3929 bytes --]
On 2023-11-18, Herman Rimm wrote:
> * gnu/bootloader/u-boot.scm (install-orangepi-r1-plus-lts-rk3328-u-boot,
> u-boot-orangepi-r1-plus-lts-rk3328-bootloader): New variables.
> * gnu/packages/bootloaders.scm (u-boot-orangepi-r1-plus-lts-rk3328): New
> variable.
Looks fine to me. Does this target depend on u-boot version 2023.10?
live well,
vagrant
> gnu/bootloader/u-boot.scm | 17 +++++++++++++++++
> gnu/packages/bootloaders.scm | 15 +++++++++++++++
> 2 files changed, 32 insertions(+)
>
> diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm
> index 712db15b02..d20aabd538 100644
> --- a/gnu/bootloader/u-boot.scm
> +++ b/gnu/bootloader/u-boot.scm
> @@ -5,6 +5,7 @@
> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
> ;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il>
> +;;; Copyright © 2023 Herman Rimm <herman_rimm@protonmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -37,6 +38,7 @@ (define-module (gnu bootloader u-boot)
> u-boot-mx6cuboxi-bootloader
> u-boot-nintendo-nes-classic-edition-bootloader
> u-boot-novena-bootloader
> + u-boot-orangepi-r1-plus-lts-rk3328-bootloader
> u-boot-pine64-plus-bootloader
> u-boot-pine64-lts-bootloader
> u-boot-pinebook-bootloader
> @@ -93,6 +95,15 @@ (define install-imx-u-boot
> (write-file-on-device u-boot (stat:size (stat u-boot))
> image (* 69 1024)))))
>
> +(define install-orangepi-r1-plus-lts-rk3328-u-boot
> + #~(lambda (bootloader root-index image)
> + (let ((idb (string-append bootloader "/libexec/idbloader.img"))
> + (u-boot (string-append bootloader "/libexec/u-boot.itb")))
> + (write-file-on-device idb (stat:size (stat idb))
> + image (* 64 512))
> + (write-file-on-device u-boot (stat:size (stat u-boot))
> + image (* 16384 512)))))
> +
> (define install-puma-rk3399-u-boot
> #~(lambda (bootloader root-index image)
> (let ((spl (string-append bootloader "/libexec/idbloader.img"))
> @@ -233,6 +244,12 @@ (define u-boot-novena-bootloader
> (inherit u-boot-imx-bootloader)
> (package u-boot-novena)))
>
> +(define u-boot-orangepi-r1-plus-lts-rk3328-bootloader
> + (bootloader
> + (inherit u-boot-bootloader)
> + (package u-boot-orangepi-r1-plus-lts-rk3328)
> + (disk-image-installer install-orangepi-r1-plus-lts-rk3328-u-boot)))
> +
> (define u-boot-pine64-plus-bootloader
> (bootloader
> (inherit u-boot-allwinner64-bootloader)
> diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
> index 5da696388a..e88abe2dec 100644
> --- a/gnu/packages/bootloaders.scm
> +++ b/gnu/packages/bootloaders.scm
> @@ -1128,6 +1128,21 @@ (define-public u-boot-novena
> version, contrary to Novena upstream, does not load u-boot.img from the first
> partition."))
>
> +(define-public u-boot-orangepi-r1-plus-lts-rk3328
> + (let ((base (make-u-boot-package "orangepi-r1-plus-lts-rk3328" "aarch64-linux-gnu")))
> + (package
> + (inherit base)
> + (arguments
> + (substitute-keyword-arguments (package-arguments base)
> + ((#:phases phases)
> + #~(modify-phases #$phases
> + (add-after 'unpack 'set-environment
> + (lambda* (#:key native-inputs inputs #:allow-other-keys)
> + (setenv "BL31" (search-input-file inputs "bl31.elf"))))))))
> + (inputs
> + (modify-inputs (package-inputs base)
> + (append arm-trusted-firmware-rk3328))))))
> +
> (define-public u-boot-cubieboard
> (make-u-boot-package "Cubieboard" "arm-linux-gnueabihf"))
>
> --
> 2.41.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [bug#67261] [PATCH 3/3] images: Add orangepi-r1-plus-lts image.
2023-11-18 16:01 ` [bug#67261] [PATCH 3/3] images: Add orangepi-r1-plus-lts image Herman Rimm via Guix-patches via
@ 2023-12-01 19:58 ` Vagrant Cascadian
2023-12-03 10:22 ` Efraim Flashner
0 siblings, 1 reply; 13+ messages in thread
From: Vagrant Cascadian @ 2023-12-01 19:58 UTC (permalink / raw)
To: Herman Rimm, 67261; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 847 bytes --]
On 2023-11-18, Herman Rimm wrote:
> * gnu/local.mk: Register image.
> * gnu/system/images/orangepi-r1-plus-lts-rk3328.scm: New file.
> * gnu/system/install.scm (orangepi-r1-plus-lts-rk3328-installation-os):
> New variable.
I guess this opens in my mind a larger question of how many images do we
want to build out-of-the-box?
Building images for every (ARM) board variant possibly supported in guix
might not be sustainable in the long term... this could easily become
hundreds of images. How big is each image?
On the other hand, most of the images for a given architecture will
share much of the work between them, as most of the individual packages
used to build each image are the same.
Not having CI build each and every image is one approach... although
then you might not notice when an individual image breaks.
live well,
vagrant
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* [bug#67261] [PATCH v2] gnu: u-boot: Update to 2023.10.
2023-12-01 19:48 ` Vagrant Cascadian
@ 2023-12-02 7:11 ` Lars-Dominik Braun
0 siblings, 0 replies; 13+ messages in thread
From: Lars-Dominik Braun @ 2023-12-02 7:11 UTC (permalink / raw)
To: Vagrant Cascadian
Cc: Maxim Cournoyer, Munyoki Kilyungi, Efraim Flashner, Herman Rimm,
jgart, 67261, Marius Bakke
Hi,
> In order to get u-boot-documentation to build, I had to add
> python-sphinx-prompt, and in order to get python-sphinx-prompt to build,
> I needed to disable tests. Can someone from the python team take a look
> at python-sphinx-prompt?
this should be fixed.
> python-sphinx-rtd-theme is an optional dependency for the documentation,
> but it does build without it. I am not sure how much nicer it is with or
> without it. Any opinions on enabling that or using the default theme?
If it builds with the theme (i.e. there’s no reason to disable that
dependency), why not use it?
Lars
^ permalink raw reply [flat|nested] 13+ messages in thread
* [bug#67261] [PATCH 3/3] images: Add orangepi-r1-plus-lts image.
2023-12-01 19:58 ` Vagrant Cascadian
@ 2023-12-03 10:22 ` Efraim Flashner
2023-12-22 23:59 ` Vagrant Cascadian
0 siblings, 1 reply; 13+ messages in thread
From: Efraim Flashner @ 2023-12-03 10:22 UTC (permalink / raw)
To: Vagrant Cascadian; +Cc: guix-devel, Herman Rimm, 67261
[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]
On Fri, Dec 01, 2023 at 11:58:57AM -0800, Vagrant Cascadian wrote:
> On 2023-11-18, Herman Rimm wrote:
> > * gnu/local.mk: Register image.
> > * gnu/system/images/orangepi-r1-plus-lts-rk3328.scm: New file.
> > * gnu/system/install.scm (orangepi-r1-plus-lts-rk3328-installation-os):
> > New variable.
>
> I guess this opens in my mind a larger question of how many images do we
> want to build out-of-the-box?
>
> Building images for every (ARM) board variant possibly supported in guix
> might not be sustainable in the long term... this could easily become
> hundreds of images. How big is each image?
>
> On the other hand, most of the images for a given architecture will
> share much of the work between them, as most of the individual packages
> used to build each image are the same.
>
> Not having CI build each and every image is one approach... although
> then you might not notice when an individual image breaks.
Do we normally build all the images in (gnu system images)? There seems
to be a large number of different file-system offsets needed for
different boards. I suppose we could standardize on a larger size that
would take care of most of them, but until something is setup to make it
possible I'm not sure it's possible to support them for Guix System
without also adding an OS config for the offsets for the root file
system.
--
Efraim Flashner <efraim@flashner.co.il> רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [bug#67261] [PATCH 3/3] images: Add orangepi-r1-plus-lts image.
2023-12-03 10:22 ` Efraim Flashner
@ 2023-12-22 23:59 ` Vagrant Cascadian
0 siblings, 0 replies; 13+ messages in thread
From: Vagrant Cascadian @ 2023-12-22 23:59 UTC (permalink / raw)
To: Efraim Flashner; +Cc: Herman Rimm, 67261, guix-devel
[-- Attachment #1: Type: text/plain, Size: 1725 bytes --]
On 2023-12-03, Efraim Flashner wrote:
> On Fri, Dec 01, 2023 at 11:58:57AM -0800, Vagrant Cascadian wrote:
>> On 2023-11-18, Herman Rimm wrote:
>> > * gnu/local.mk: Register image.
>> > * gnu/system/images/orangepi-r1-plus-lts-rk3328.scm: New file.
>> > * gnu/system/install.scm (orangepi-r1-plus-lts-rk3328-installation-os):
>> > New variable.
>>
>> I guess this opens in my mind a larger question of how many images do we
>> want to build out-of-the-box?
>>
>> Building images for every (ARM) board variant possibly supported in guix
>> might not be sustainable in the long term... this could easily become
>> hundreds of images. How big is each image?
>>
>> On the other hand, most of the images for a given architecture will
>> share much of the work between them, as most of the individual packages
>> used to build each image are the same.
>>
>> Not having CI build each and every image is one approach... although
>> then you might not notice when an individual image breaks.
>
> Do we normally build all the images in (gnu system images)? There seems
> to be a large number of different file-system offsets needed for
> different boards. I suppose we could standardize on a larger size that
> would take care of most of them, but until something is setup to make it
> possible I'm not sure it's possible to support them for Guix System
> without also adding an OS config for the offsets for the root file
> system.
From a quick look, ci.guix.gnu.org builds
pinebook-pro-barebones-raw-image, pine64-barebones-raw-image,
novena-barebones-raw-image ... but I could not find an image for rock64
... so I am not sure what is built by CI out of the box.
live well,
vagrant
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* bug#67261: [PATCH 0/3] Update u-boot to 2023.10.
2023-11-18 15:38 [bug#67261] [PATCH 0/3] Update u-boot to 2023.10 Herman Rimm via Guix-patches via
` (3 preceding siblings ...)
2023-11-27 8:33 ` [bug#67261] [PATCH v2] gnu: u-boot: Update to 2023.10 Herman Rimm via Guix-patches via
@ 2023-12-23 0:19 ` Vagrant Cascadian
4 siblings, 0 replies; 13+ messages in thread
From: Vagrant Cascadian @ 2023-12-23 0:19 UTC (permalink / raw)
To: 67261-done; +Cc: Herman Rimm, Efraim Flashner
[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]
On 2023-11-18, Herman Rimm wrote:
> I use an OrangePi R1 Plus LTS with a u-boot v2023.10 bootloader. I have
> not performed any other tests. [PATCH 2/3], [PATCH 3/3] and boot log
> below for context.
Sorry it took so long to get around to this! ... Just in time for
2024.01 to roll around the corner in a couple weeks!
I have pushed to master as:
fad93748cd2d44f7f68d2d973a22ed0b438e657b gnu: u-boot: Update to 2023.10.
88fb95903c1d94b3be7e8a811d943af988041e4e gnu: bootloader: Add orangepi-r1-plus-lts-rk3328 bootloader.
ab1ff7ca40b0a2d935f715dcf64f0f3128632d3d images: Add orangepi-r1-plus-lts image.
I still wonder what to do long-term about which images should get built
out of the box, but for now the pattern seems to be add them if someone
wants them. Debian solved the issue of arbitrary number of images by
building the image in two parts, and concatenating the images
together. It is a bit rougher on the end-user to concatenate two images
together, but means the images can for the most part be shared across
all supported (and even unsupported) platforms, only the bootloader
areas differ:
https://deb.debian.org/debian/dists/bookworm/main/installer-arm64/20230607/images/netboot/SD-card-images/README.concatenateable_images
live well,
vagrant
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2023-12-23 0:20 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-18 15:38 [bug#67261] [PATCH 0/3] Update u-boot to 2023.10 Herman Rimm via Guix-patches via
2023-11-18 16:01 ` [bug#67261] [PATCH 1/3] gnu: u-boot: Update " Herman Rimm via Guix-patches via
2023-11-24 21:23 ` Vagrant Cascadian
2023-11-18 16:01 ` [bug#67261] [PATCH 2/3] gnu: bootloader: Add orangepi-r1-plus-lts-rk3328 bootloader Herman Rimm via Guix-patches via
2023-12-01 19:50 ` Vagrant Cascadian
2023-11-18 16:01 ` [bug#67261] [PATCH 3/3] images: Add orangepi-r1-plus-lts image Herman Rimm via Guix-patches via
2023-12-01 19:58 ` Vagrant Cascadian
2023-12-03 10:22 ` Efraim Flashner
2023-12-22 23:59 ` Vagrant Cascadian
2023-11-27 8:33 ` [bug#67261] [PATCH v2] gnu: u-boot: Update to 2023.10 Herman Rimm via Guix-patches via
2023-12-01 19:48 ` Vagrant Cascadian
2023-12-02 7:11 ` Lars-Dominik Braun
2023-12-23 0:19 ` bug#67261: [PATCH 0/3] Update u-boot " Vagrant Cascadian
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.