Skip to content

Commit 36ee0ba

Browse files
author
Neeraj Deshpande
committed
Updated support for Arris platform.
1 parent c86d327 commit 36ee0ba

File tree

8 files changed

+8
-166
lines changed

8 files changed

+8
-166
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

configs/arrisrdk_wpe_ml_defconfig

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

configs/arrisrdkb0_wpe_ml_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ BR2_PACKAGE_GESFTPSERVER=y
4646
BR2_PACKAGE_WPEBACKEND_RDK=y
4747
BR2_PACKAGE_WPEWEBKIT=y
4848
BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA=y
49-
BR2_PACKAGE_WPEWEBKIT_USE_PUNCH_HOLE_NONE=y
5049

5150
BR2_PACKAGE_WPEFRAMEWORK=y
5251
BR2_PACKAGE_WPEFRAMEWORK_CDMI_CLEARKEY=y
@@ -115,3 +114,6 @@ BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
115114
BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
116115
BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT=y
117116
BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
117+
118+
BR2_PACKAGE_RDKSPLASHSCREEN=y
119+
BR2_PACKAGE_RDKSPLASHSCREEN_OPERATOR="metrological"

package/bcm-refsw/bcm-refsw.mk

Lines changed: 1 addition & 1 deletion
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)" \

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/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

package/wpe/wpeframework-plugins/wpeframework-plugins.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
WPEFRAMEWORK_PLUGINS_VERSION = a9e14d8e6364e3f5c65b8ec57696a92204947f29
7+
WPEFRAMEWORK_PLUGINS_VERSION = 42de79c0a6022e3c94cab8e8fe490f48e2d5d5f8
88
WPEFRAMEWORK_PLUGINS_SITE = $(call github,rdkcentral,ThunderNanoServices,$(WPEFRAMEWORK_PLUGINS_VERSION))
99
WPEFRAMEWORK_PLUGINS_INSTALL_STAGING = YES
1010
WPEFRAMEWORK_PLUGINS_DEPENDENCIES = wpeframework-clientlibraries libpng

0 commit comments

Comments
 (0)