From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 18 Sep 2024 00:51:36 +0000 (-0700)
Subject: uboot-kirkwood: fix compilation with GCC14
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d3dad5b10b443eb94cf482f92ae8929a722412d6;p=openwrt%2Fstaging%2Fblocktrron.git

uboot-kirkwood: fix compilation with GCC14

Missing header.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16467
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/package/boot/uboot-kirkwood/Makefile b/package/boot/uboot-kirkwood/Makefile
index 7338e5d868..afeee805a0 100644
--- a/package/boot/uboot-kirkwood/Makefile
+++ b/package/boot/uboot-kirkwood/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_VERSION:=2020.04
-PKG_RELEASE:=10
+PKG_RELEASE:=11
 
 PKG_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372
 
diff --git a/package/boot/uboot-kirkwood/patches/180-netgear-stora.patch b/package/boot/uboot-kirkwood/patches/180-netgear-stora.patch
index c6aced4221..bdf82ebea5 100644
--- a/package/boot/uboot-kirkwood/patches/180-netgear-stora.patch
+++ b/package/boot/uboot-kirkwood/patches/180-netgear-stora.patch
@@ -230,7 +230,7 @@
 +
 --- /dev/null
 +++ b/board/Marvell/netgear_ms2110/netgear_ms2110.c
-@@ -0,0 +1,151 @@
+@@ -0,0 +1,152 @@
 +/*
 + * Copyright (C) 2014-2017 bodhi <mibodhi@gmail.com>
 + *
@@ -264,6 +264,7 @@
 +#include <asm/arch/soc.h>
 +#include <asm/arch/mpp.h>
 +#include "netgear_ms2110.h"
++#include <asm/arch/cpu.h>
 +#include <asm/mach-types.h>
 +
 +DECLARE_GLOBAL_DATA_PTR;
diff --git a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
index 4cf874b368..00bc29f13e 100644
--- a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
+++ b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-kirkwood/Kconfig
 +++ b/arch/arm/mach-kirkwood/Kconfig
-@@ -111,4 +111,7 @@ source "board/alliedtelesis/SBx81LIFXCAT
+@@ -115,4 +115,7 @@ source "board/alliedtelesis/SBx81LIFXCAT
  source "board/Marvell/db-88f6281-bp/Kconfig"
  source "board/checkpoint/l-50/Kconfig"