Skip to content

Commit 85ef03e

Browse files
author
Neeraj Deshpande
committed
bcm-refsw & Linux kernel version bump.
1 parent 7700180 commit 85ef03e

File tree

7 files changed

+106
-9
lines changed

7 files changed

+106
-9
lines changed

‎configs/arrisrdkb0_wpe_ml_defconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
1717
BR2_LINUX_KERNEL=y
1818
BR2_LINUX_KERNEL_CUSTOM_GIT=y
1919
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="[email protected]:Metrological/bcm-stblinux-4.9.git"
20-
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="dae011466609eb35cb5543e281a82207b4f03141"
20+
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e25c90d1d2e6af56705e6b46d47797989cfe2676"
2121
BR2_LINUX_KERNEL_DEFCONFIG="brcmstb"
2222
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/bcm/config-fragments/cgroups.cfg board/bcm/config-fragments/ipv6.cfg board/bcm/config-fragments/netfilter.cfg board/bcm/config-fragments/wpa-supplicant.cfg board/bcm/config-fragments/no-vdso.cfg board/bcm/config-fragments/bt.cfg"
2323
BR2_PACKAGE_BUSYBOX_SMP=y
@@ -29,7 +29,7 @@ BR2_TARGET_GENERIC_CABUNDLE=y
2929
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
3030

3131
BR2_PACKAGE_BCM_REFSW=y
32-
BR2_PACKAGE_BCM_REFSW_19_2=y
32+
BR2_PACKAGE_BCM_REFSW_20_2=y
3333
BR2_PACKAGE_BCM_REFSW_PLATFORM_72604_B0=y
3434
BR2_PACKAGE_BCM_REFSW_BOXMODE="4"
3535
BR2_PACKAGE_BCM_REFSW_NXCLIENT_EXAMPLES=y

‎package/bcm-refsw/20.2/0001-changes-for-bp3_tool.patch‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff -pruN bcm-refsw-20.2.orig/BSEAV/tools/bp3/b_bp3_targets.inc bcm-refsw-20.2/BSEAV/tools/bp3/b_bp3_targets.inc
2+
--- bcm-refsw-20.2.orig/BSEAV/tools/bp3/b_bp3_targets.inc 2020-10-06 04:51:42.000000000 +0530
3+
+++ bcm-refsw-20.2/BSEAV/tools/bp3/b_bp3_targets.inc 2022-02-11 20:35:26.670644009 +0530
4+
@@ -47,19 +47,6 @@ $(error B_REFSW_TOP must be defined)
5+
endif
6+
7+
# Specify any prerequisite subpackages here:
8+
-include $(B_REFSW_TOP)/BSEAV/opensource/openssl/b_openssl_targets.inc
9+
-B_BP3_SUB_BUILDS += b_openssl_target_build
10+
-B_BP3_SUB_CLEANS += b_openssl_target_clean
11+
-B_BP3_SUB_CLEAN_ALL += b_openssl_target_clean_all
12+
-B_BP3_BUILD_FILES += $(B_OPENSSL_BUILD_FILES)
13+
-B_OPENSSL_TARGET_MAKEFLAGS += $(B_BP3_TARGET_MAKEFLAGS)
14+
-
15+
-include $(B_REFSW_TOP)/BSEAV/opensource/curl/b_curl_targets.inc
16+
-B_BP3_SUB_BUILDS += b_curl_target_build
17+
-B_BP3_SUB_CLEANS += b_curl_target_clean
18+
-B_BP3_SUB_CLEAN_ALL += b_curl_target_clean_all
19+
-B_BP3_BUILD_FILES += $(B_CURL_BUILD_FILES)
20+
-B_CURL_TARGET_MAKEFLAGS += $(B_BP3_TARGET_MAKEFLAGS)
21+
22+
include $(B_REFSW_TOP)/BSEAV/opensource/cjson/b_libcjson_targets.inc
23+
B_BP3_SUB_BUILDS += b_cjson_target_build

‎package/bcm-refsw/20.2/0002-fixes-for-bcm-refsw.patch‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
diff --git a/BSEAV/lib/gpu/include/EGL/eglplatform.h b/BSEAV/lib/gpu/include/EGL/eglplatform.h
2+
index b71c2d19a..2e9fe7f2e 100644
3+
--- a/BSEAV/lib/gpu/include/EGL/eglplatform.h
4+
+++ b/BSEAV/lib/gpu/include/EGL/eglplatform.h
5+
@@ -95,6 +95,8 @@ typedef void* EGLNativeDisplayType;
6+
7+
#elif defined(__unix__)
8+
9+
+#define BROADCOM_PLATFORM 1
10+
+
11+
#ifdef BROADCOM_PLATFORM
12+
13+
typedef void *EGLNativeDisplayType;
14+
diff --git a/BSEAV/lib/gpu/vc5/platform/nexus/platform_nexus_common.mk b/BSEAV/lib/gpu/vc5/platform/nexus/platform_nexus_common.mk
15+
index fc37e4408..8a7c0121b 100644
16+
--- a/BSEAV/lib/gpu/vc5/platform/nexus/platform_nexus_common.mk
17+
+++ b/BSEAV/lib/gpu/vc5/platform/nexus/platform_nexus_common.mk
18+
@@ -82,7 +82,6 @@ CFLAGS += \
19+
-mfpu=neon
20+
endif
21+
22+
-LDFLAGS += -Wl,--no-undefined
23+
LDFLAGS += -L$(V3DDRIVER_LIB_TARGET) -lv3ddriver -lpthread
24+
25+
ifeq ($(V3D_DEBUG),y)
26+
@@ -135,9 +134,7 @@ OUTDIR :
27+
28+
.phony: V3DDriver
29+
V3DDriver:
30+
- $(Q)$(MAKE) --no-print-directory -C $(V3D_DIR) -f V3DDriver.mk \
31+
- OBJDIR=$(V3DDRIVER_OBJ_TARGET) LIBDIR=$(V3DDRIVER_LIB_TARGET) \
32+
- NEXUS_BIN_DIR=$(NEXUS_BIN_DIR) $(MAKECMDGOALS)
33+
+ $(Q)$(MAKE) --no-print-directory -C $(V3D_DIR) -f V3DDriver.mk $(MAKECMDGOALS)
34+
35+
# $(1) = src
36+
# $(2) = obj
37+
diff --git a/magnum/basemodules/dbg/bdbg.h b/magnum/basemodules/dbg/bdbg.h
38+
index db4f40495..fa9046659 100644
39+
--- a/magnum/basemodules/dbg/bdbg.h
40+
+++ b/magnum/basemodules/dbg/bdbg.h
41+
@@ -957,7 +957,7 @@ See Also:
42+
#else
43+
#define BDBG_ASSERT(expr) (expr) ? (void) 0 : BDBG_P_AssertFailed(#expr, BSTD_FILE, BSTD_LINE)
44+
#endif
45+
-#define BDBG_CASSERT(expr) do switch(0){case 0: case (expr):;} while(0)
46+
+#define BDBG_CASSERT(expr) do switch(0){case (expr):;} while(0)
47+
#define BDBG_CWARNING(expr) do {if(0){int unused = 1/(expr);unused++;}} while(0)
48+
#define BDBG_CWARNING_EXPR(expr) ((1/(expr)) ? 0 : 0)
49+
50+
diff --git a/nexus/nxclient/apps/Makefile b/nexus/nxclient/apps/Makefile
51+
index 8b46518ce..2d2055625 100644
52+
--- a/nexus/nxclient/apps/Makefile
53+
+++ b/nexus/nxclient/apps/Makefile
54+
@@ -52,7 +52,6 @@ BASIC_BUILD_APPS = \
55+
audio_fade \
56+
audio_fade_toggle \
57+
audio_karaoke \
58+
- audio_presentation \
59+
audio_wav_convert \
60+
best_effort_bvn_status \
61+
blit_client \

‎package/bcm-refsw/Config.in‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ choice
7171

7272
config BR2_PACKAGE_BCM_REFSW_19_2
7373
bool "bcm-refsw 19.2"
74+
75+
config BR2_PACKAGE_BCM_REFSW_20_2
76+
bool "bcm-refsw 20.2"
7477
endchoice
7578

7679
if BR2_PACKAGE_BCM_REFSW_CUSTOM_VERSION
@@ -191,28 +194,28 @@ config BR2_PACKAGE_BCM_REFSW_SAGE_PATH
191194
config BR2_PACKAGE_BCM_REFSW_PAK_PATH
192195
string "PAK Path"
193196
default "/usr/bin/"
194-
depends on BR2_PACKAGE_BCM_REFSW_18_2 || BR2_PACKAGE_BCM_REFSW_19_1 || BR2_PACKAGE_BCM_REFSW_19_2
197+
depends on BR2_PACKAGE_BCM_REFSW_18_2 || BR2_PACKAGE_BCM_REFSW_19_1 || BR2_PACKAGE_BCM_REFSW_19_2 || BR2_PACKAGE_BCM_REFSW_20_2
195198
help
196199
PAK binaries path
197200

198201
config BR2_PACKAGE_BCM_REFSW_DRM_PATH
199202
string "DRM Path"
200203
default "/usr/bin/"
201-
depends on BR2_PACKAGE_BCM_REFSW_18_2 || BR2_PACKAGE_BCM_REFSW_19_1 || BR2_PACKAGE_BCM_REFSW_19_2
204+
depends on BR2_PACKAGE_BCM_REFSW_18_2 || BR2_PACKAGE_BCM_REFSW_19_1 || BR2_PACKAGE_BCM_REFSW_19_2 || BR2_PACKAGE_BCM_REFSW_20_2
202205
help
203206
DRM binaries path
204207

205208
config BR2_PACKAGE_BCM_REFSW_HDCP1XBIN_PATH
206209
string "HDCP 1.x bin"
207210
default ""
208-
depends on BR2_PACKAGE_BCM_REFSW_18_2 || BR2_PACKAGE_BCM_REFSW_19_1 || BR2_PACKAGE_BCM_REFSW_19_2
211+
depends on BR2_PACKAGE_BCM_REFSW_18_2 || BR2_PACKAGE_BCM_REFSW_19_1 || BR2_PACKAGE_BCM_REFSW_19_2 || BR2_PACKAGE_BCM_REFSW_20_2
209212
help
210213
A file locator for the HDCP1.X key
211214

212215
config BR2_PACKAGE_BCM_REFSW_HDCP2XBIN_PATH
213216
string "HDCP 2.x bin"
214217
default ""
215-
depends on BR2_PACKAGE_BCM_REFSW_18_2 || BR2_PACKAGE_BCM_REFSW_19_1 || BR2_PACKAGE_BCM_REFSW_19_2
218+
depends on BR2_PACKAGE_BCM_REFSW_18_2 || BR2_PACKAGE_BCM_REFSW_19_1 || BR2_PACKAGE_BCM_REFSW_19_2 || BR2_PACKAGE_BCM_REFSW_20_2
216219
help
217220
A file locator for the HDCP2.X key
218221

‎package/bcm-refsw/bcm-refsw.mk‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ else ifeq ($(BR2_PACKAGE_BCM_REFSW_19_1),y)
4040
BCM_REFSW_VERSION = 19.1.1
4141
else ifeq ($(BR2_PACKAGE_BCM_REFSW_19_2),y)
4242
BCM_REFSW_VERSION = 19.2
43+
else ifeq ($(BR2_PACKAGE_BCM_REFSW_20_2),y)
44+
BCM_REFSW_VERSION = 20.2
4345
else
4446
BCM_REFSW_VERSION = 16.2-7
4547
endif
@@ -143,7 +145,10 @@ endif
143145
endif
144146

145147
ifeq ($(BCM_REFSW_PLATFORM_VC),vc5)
146-
ifeq ($(shell expr $(BCM_REFSW_VERSION) \>= 19.2),1)
148+
ifeq ($(shell expr $(BCM_REFSW_VERSION) \>= 20.2),1)
149+
# We are using VC5 core >= 20.2
150+
BCM_REFSW_VCX_KHRN = $(BCM_REFSW_DIR)/BSEAV/lib/gpu/include
151+
else ifeq ($(shell expr $(BCM_REFSW_VERSION) \>= 19.2),1)
147152
# We are using VC5 core >= 19.2
148153
BCM_REFSW_VCX_KHRN = $(BCM_REFSW_DIR)/BSEAV/lib/gpu/include
149154
else ifeq ($(shell expr $(BCM_REFSW_VERSION) \>= 16.2),1)

‎package/bcm-refsw/nexus.inc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,9 @@ ifeq ($(BR2_PACKAGE_BCM_REFSW_SAGE_PLAYREADY_30),y)
176176
177177
BCM_NEXUS_PLAYREADY30_DIR = /BSEAV/thirdparty/playready/3.0
178178
179-
ifeq ($(shell expr $(BCM_REFSW_VERSION) \>= 19.2),1)
179+
ifeq ($(shell expr $(BCM_REFSW_VERSION) \>= 20.2),1)
180+
BCM_NEXUS_PLAYREADY30_LIBDIR = $(BCM_NEXUS_PLAYREADY30_DIR)/bin/$(ARCH)-linux/secv2/lib
181+
else ifeq ($(shell expr $(BCM_REFSW_VERSION) \>= 19.2),1)
180182
BCM_NEXUS_PLAYREADY30_LIBDIR = $(BCM_NEXUS_PLAYREADY30_DIR)/bin/$(ARCH)-linux/secv2/lib
181183
else ifeq ($(shell expr $(BCM_REFSW_VERSION) \>= 18.1),1)
182184
ifeq ($(BCM_REFSW_PLATFORM_SECURITY_ZEUS_VERSION),5)
@@ -342,5 +344,6 @@ define BCM_REFSW_INSTALL_BP3
342344
$(INSTALL) -m 750 -D $(BCM_REFSW_BIN)/bp3 $(1)/usr/bin
343345
$(INSTALL) -m 644 -D $(BCM_REFSW_BIN)/libbp3_host.so $(1)/usr/lib
344346
$(INSTALL) -m 644 -D $(BCM_REFSW_BIN)/libcjson.so $(1)/usr/lib
347+
cd $1/usr/lib && ln -sf libcjson.so libcjson.so.1
345348
endef
346349
endif

‎package/bcm-refsw/nxserver.inc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ define BCM_REFSW_INSTALL_NXSERVER
4545
fi
4646
endef
4747

48-
ifeq ($(shell expr $(BCM_REFSW_VERSION) \>= 19.1),1)
48+
ifeq ($(shell expr $(BCM_REFSW_VERSION) \>= 20.2),1)
49+
NX_SERVER_ARCHIVE = $(BCM_REFSW_OUTPUT)/nexus/nxclient/$(ARCH)-linux/server/libnxserver.a
50+
else ifeq ($(shell expr $(BCM_REFSW_VERSION) \>= 19.1),1)
4951
NX_SERVER_ARCHIVE = $(BCM_REFSW_OUTPUT)/nexus/nxclient/$(ARCH)-linux/server/libnxserver.a
5052
else
5153
NX_SERVER_ARCHIVE = $(BCM_REFSW_BIN)/libnxserver.a

0 commit comments

Comments
 (0)