Skip to content

Commit 58ba59a

Browse files
author
Neeraj Deshpande
authored
Merge pull request #382 from WebPlatformForEmbedded/R3-update
Sync support for Arris platform.
2 parents 09f0b33 + 487c306 commit 58ba59a

File tree

10 files changed

+97
-67
lines changed

10 files changed

+97
-67
lines changed

‎board/arris/S30mountroot‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎board/arris/post-build.sh‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,8 @@ echo "Post-build: processing $@"
77

88
BOARD_DIR="$(dirname $0)"
99

10-
# Copy index.html page for WPE Framework
11-
if [ -f "${BOARD_DIR}/index.html" ]; then
12-
mkdir -p "${TARGET_DIR}/www/"
13-
cp -pf "${BOARD_DIR}/index.html" "${TARGET_DIR}/www/"
14-
fi
15-
1610
# Copy keymap for Arris remote
1711
if [ -f "${BOARD_DIR}/arris-ir-remote.json" ]; then
1812
mkdir -p "${TARGET_DIR}/usr/share/WPEFramework/RemoteControl/"
1913
cp -pf "${BOARD_DIR}/arris-ir-remote.json" "${TARGET_DIR}/usr/share/WPEFramework/RemoteControl/ir-remote.json"
2014
fi
21-
22-
mkdir -p "${TARGET_DIR}/boot"
23-
grep -q '^/dev/sda1' "${TARGET_DIR}/etc/fstab" || \
24-
echo -e '/dev/sda1 /boot vfat defaults 0 0' >> "${TARGET_DIR}/etc/fstab"
25-
26-
mkdir -p "${TARGET_DIR}/root"
27-
grep -q '^/dev/sda2' "${TARGET_DIR}/etc/fstab" || \
28-
echo -e '/dev/sda2 /root ext4 defaults 0 0' >> "${TARGET_DIR}/etc/fstab"
29-
30-
install -m 0755 -D board/arris/S30mountroot \
31-
${TARGET_DIR}/etc/init.d/S30mountroot

‎board/bcm/index.html‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎configs/arrisrdkb0_wpe_ml_defconfig‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y
66
BR2_TOOLCHAIN_BUILDROOT_CXX=y
77
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
88

9+
BR2_BINUTILS_VERSION_2_33_X=y
10+
BR2_GCC_VERSION_9_X=y
11+
912
BR2_CCACHE=y
1013
BR2_OPTIMIZE_2=y
1114

@@ -30,6 +33,8 @@ BR2_PACKAGE_BCM_REFSW_19_2=y
3033
BR2_PACKAGE_BCM_REFSW_PLATFORM_72604_B0=y
3134
BR2_PACKAGE_BCM_REFSW_BOXMODE="4"
3235
BR2_PACKAGE_BCM_REFSW_NXCLIENT_EXAMPLES=y
36+
BR2_PACKAGE_BCM_REFSW_SAGE=y
37+
BR2_PACKAGE_BCM_REFSW_BP3=y
3338

3439
BR2_PACKAGE_DROPBEAR=y
3540
BR2_PACKAGE_LIBSOUP=y
@@ -45,7 +50,6 @@ BR2_PACKAGE_GESFTPSERVER=y
4550
BR2_PACKAGE_WPEBACKEND_RDK=y
4651
BR2_PACKAGE_WPEWEBKIT=y
4752
BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA=y
48-
BR2_PACKAGE_WPEWEBKIT_USE_PUNCH_HOLE_NONE=y
4953

5054
BR2_PACKAGE_WPEFRAMEWORK=y
5155
BR2_PACKAGE_WPEFRAMEWORK_CDMI_CLEARKEY=y
@@ -114,3 +118,6 @@ BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
114118
BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
115119
BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT=y
116120
BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
121+
122+
BR2_PACKAGE_RDKSPLASHSCREEN=y
123+
BR2_PACKAGE_RDKSPLASHSCREEN_OPERATOR="metrological"

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
diff -ruN bcm-refsw-19.2.orig/BSEAV/tools/bp3/b_bp3_targets.inc bcm-refsw-19.2/BSEAV/tools/bp3/b_bp3_targets.inc
2+
--- bcm-refsw-19.2.orig/BSEAV/tools/bp3/b_bp3_targets.inc 2020-06-24 14:44:51.000000000 +0530
3+
+++ bcm-refsw-19.2/BSEAV/tools/bp3/b_bp3_targets.inc 2021-08-04 14:49:44.891228055 +0530
4+
@@ -47,20 +47,6 @@
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_libbuild
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
24+
B_BP3_SUB_CLEANS += b_cjson_target_clean
25+
diff -ruN bcm-refsw-19.2.orig/BSEAV/tools/bp3/bp3_host.c bcm-refsw-19.2/BSEAV/tools/bp3/bp3_host.c
26+
--- bcm-refsw-19.2.orig/BSEAV/tools/bp3/bp3_host.c 2020-06-24 14:44:51.000000000 +0530
27+
+++ bcm-refsw-19.2/BSEAV/tools/bp3/bp3_host.c 2021-08-04 14:56:18.839951128 +0530
28+
@@ -367,7 +367,7 @@
29+
memcpy(uu + 12, &x, 4);
30+
char usn[37];
31+
uuid_unparse(uu, usn);
32+
- strncpy(usn, "bp30", 4); // last digit is version number
33+
+ memcpy(usn, "bp30", 4); // last digit is version number
34+
struct mg_context *ctx = start_webserver();
35+
run_ssdp(port, buf, model, usn);
36+
mg_stop(ctx);
37+
diff -ruN bcm-refsw-19.2.orig/BSEAV/tools/bp3/quick_ssdp.c bcm-refsw-19.2/BSEAV/tools/bp3/quick_ssdp.c
38+
--- bcm-refsw-19.2.orig/BSEAV/tools/bp3/quick_ssdp.c 2020-06-24 14:44:51.000000000 +0530
39+
+++ bcm-refsw-19.2/BSEAV/tools/bp3/quick_ssdp.c 2021-08-04 14:57:39.054248748 +0530
40+
@@ -253,7 +253,7 @@
41+
}
42+
43+
if (pModelName) {
44+
- strncpy(model_name, pModelName, sizeof(model_name));
45+
+ memcpy(model_name, pModelName, sizeof(model_name));
46+
uuid[255] = '\0';
47+
} else {
48+
strcpy(model_name, "deadbeef-dead-beef-dead-beefdeadbeef");

‎package/bcm-refsw/Config.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,4 +282,10 @@ config BR2_PACKAGE_BCM_REFSW_KERNELSPACE_HEADERS
282282
default n
283283
help
284284
Installs kernelspace nexus headers used to build some kernelmodules like greenpeak.
285+
286+
config BR2_PACKAGE_BCM_REFSW_BP3
287+
bool "bp3tool"
288+
default n
289+
help
290+
BP3 tool
285291
endif

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

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ BCM_REFSW_MAKE_ENV += \
9393
NEXUS_PLATFORM=$(BCM_REFSW_PLATFORM) \
9494
NEXUS_MODE=proxy \
9595
NEXUS_HEADERS=y \
96-
NEXUS_EXTRA_CFLAGS="$(TARGET_CFLAGS) -Wno-error=undef $(BCM_REFSW_DEBUG_FLAGS)"\
96+
NEXUS_EXTRA_CFLAGS="$(TARGET_CFLAGS) -Wno-error=undef $(BCM_REFSW_PLATFORM_FLAGS) $(BCM_REFSW_DEBUG_FLAGS)"\
9797
NEXUS_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
9898
VCX=$(BCM_REFSW_PLATFORM_VC) \
9999
V3D_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
@@ -119,6 +119,10 @@ else
119119
BCM_REFSW_MAKE_ENV += SAGE_SUPPORT=n
120120
endif
121121

122+
ifeq ($(BR2_PACKAGE_BCM_REFSW_BP3),y)
123+
BCM_REFSW_MAKE_ENV += BP3_PROVISIONING=y
124+
endif
125+
122126
ifeq ($(shell expr $(BCM_REFSW_VERSION) \>= 17.1),1)
123127
BCM_REFSW_VCX = $(BCM_REFSW_DIR)/BSEAV/lib/gpu/${BCM_REFSW_PLATFORM_VC}
124128
else
@@ -181,11 +185,12 @@ define BCM_REFSW_BUILD_CMDS
181185
$(BCM_REFSW_BUILD_NEXUS_LIBB_OS)
182186
$(BCM_REFSW_BUILD_NEXUS_KERNEL_HEADERS)
183187
$(BCM_REFSW_GENERATE_NEXUS_PC)
184-
$(BCM_REFSW_BUILD_SAGE_PRDY30_SVP)
185-
$(BCM_REFSW_BUILD_DRMROOTFS)
186-
$(BCM_REFSW_BUILD_PRDYHTTP)
187-
$(BCM_REFSW_BUILD_SAGE_WIDEVINE)
188-
$(BCM_REFSW_BUILD_SAGE_MANUFACTURING)
188+
$(BCM_REFSW_BUILD_SAGE_PRDY30_SVP)
189+
$(BCM_REFSW_BUILD_DRMROOTFS)
190+
$(BCM_REFSW_BUILD_PRDYHTTP)
191+
$(BCM_REFSW_BUILD_SAGE_WIDEVINE)
192+
$(BCM_REFSW_BUILD_SAGE_MANUFACTURING)
193+
$(BCM_REFSW_BUILD_BP3)
189194
endef
190195

191196
define BCM_REFSW_INSTALL_STAGING_CMDS
@@ -214,12 +219,12 @@ define BCM_REFSW_INSTALL_TARGET_CMDS
214219
$(call BCM_REFSW_INSTALL_SAGE_SRAI, $(TARGET_DIR))
215220
$(call BCM_REFSW_INSTALL_SECBUF, $(TARGET_DIR))
216221
$(call BCM_REFSW_INSTALL_NEXUS_LIBB_OS, $(TARGET_DIR))
217-
$(call BCM_REFSW_INSTALL_PLAYREADY30, $(TARGET_DIR))
218-
$(call BCM_REFSW_INSTALL_WIDEVINE, $(TARGET_DIR))
219-
$(call BCM_REFSW_INSTALL_DRMROOTFS, $(TARGET_DIR))
220-
$(call BCM_REFSW_INSTALL_PRDYHTTP, $(TARGET_DIR))
221-
$(call BCM_REFSW_INSTALL_SAGE_BINS, $(TARGET_DIR))
222-
222+
$(call BCM_REFSW_INSTALL_PLAYREADY30, $(TARGET_DIR))
223+
$(call BCM_REFSW_INSTALL_WIDEVINE, $(TARGET_DIR))
224+
$(call BCM_REFSW_INSTALL_DRMROOTFS, $(TARGET_DIR))
225+
$(call BCM_REFSW_INSTALL_PRDYHTTP, $(TARGET_DIR))
226+
$(call BCM_REFSW_INSTALL_SAGE_BINS, $(TARGET_DIR))
227+
$(call BCM_REFSW_INSTALL_BP3, $(TARGET_DIR))
223228
endef
224229

225230
$(eval $(generic-package))

‎package/bcm-refsw/graphics.inc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ define BCM_REFSW_INSTALL_GRAPHICS
2222
$(INSTALL) -D $(BCM_REFSW_BIN)/libv3dplatform.so $1/usr/lib/libv3dplatform.so ; \
2323
fi
2424
$(INSTALL) -D $(BCM_REFSW_BIN)/libnxpl.so $1/usr/lib/libnxpl.so
25-
cd $1/usr/lib && ln -sf libv3ddriver.so libEGL.so && ln -sf libv3ddriver.so libGLESv2.so
25+
cd $1/usr/lib && ln -sf libv3ddriver.so libEGL.so && ln -sf libv3ddriver.so libEGL.so.1 \
26+
&& ln -sf libv3ddriver.so libGLESv2.so && ln -sf libv3ddriver.so libGLESv2.so.2
2627
endef
2728

2829
ifneq ($(BR2_PACKAGE_BCM_REFSW_V3D_DRM),y)

‎package/bcm-refsw/nexus.inc‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,3 +329,18 @@ define BCM_REFSW_INSTALL_NEXUS_PC
329329
$(INSTALL) -D $(BCM_REFSW_OUTPUT)/nexus.pc $(1)/usr/lib/pkgconfig/
330330
$(INSTALL) -D $(BCM_REFSW_OUTPUT)/nexus-client.pc $(1)/usr/lib/pkgconfig/
331331
endef
332+
333+
ifeq ($(BR2_PACKAGE_BCM_REFSW_BP3),y)
334+
define BCM_REFSW_BUILD_BP3
335+
$(TARGET_CONFIGURE_OPTS) \
336+
$(TARGET_MAKE_ENV) \
337+
$(BCM_REFSW_CONF_OPTS) \
338+
$(BCM_REFSW_MAKE_ENV) \
339+
$(MAKE) -C $(@D)/BSEAV/tools/bp3 install
340+
endef
341+
define BCM_REFSW_INSTALL_BP3
342+
$(INSTALL) -m 750 -D $(BCM_REFSW_BIN)/bp3 $(1)/usr/bin
343+
$(INSTALL) -m 644 -D $(BCM_REFSW_BIN)/libbp3_host.so $(1)/usr/lib
344+
$(INSTALL) -m 644 -D $(BCM_REFSW_BIN)/libcjson.so $(1)/usr/lib
345+
endef
346+
endif

‎package/bcm-refsw/platforms.inc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ BCM_REFSW_PLATFORM_REV = B0
2828
BCM_REFSW_PLATFORM_VC = vc5
2929
BCM_REFSW_BCHP_CHIP = 7260
3030
BCM_REFSW_BCHP_VER_LOWER = b0
31+
BCM_REFSW_PLATFORM_FLAGS += -D__ARM_PCS_VFP
3132
else ifeq ($(BR2_PACKAGE_BCM_REFSW_PLATFORM_7268_B0),y)
3233
BCM_REFSW_PLATFORM = 97268
3334
BCM_REFSW_PLATFORM_REV = B0

0 commit comments

Comments
 (0)