summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-27 14:18:34 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-27 14:18:34 +0000
commit40efe09d28b970e3120d3e8a5c84b9181f17ca7e (patch)
tree65ceb306726b072583bf79767da21bf0852b273a
parentd7bc7f5ba2c154b8c5c4f7320cc207e3ebdc2bd6 (diff)
broadcom-wl: add nvram stub to fix nas compile after the switch to unvram
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15439 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/broadcom-wl/Makefile12
-rw-r--r--package/broadcom-wl/src/nvram/nvram_stub.c16
2 files changed, 25 insertions, 3 deletions
diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index e8aea74962..5317e0d430 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -100,7 +100,6 @@ endef
define Package/wl
$(call Package/broadcom-wl/Default)
- DEPENDS+= +nvram
TITLE:=Proprietary Broadcom wl driver config utility
endef
@@ -111,7 +110,6 @@ endef
define Package/nas
$(call Package/broadcom-wl/Default)
- DEPENDS+= +nvram
TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
endef
@@ -150,17 +148,25 @@ define Build/Compile
$(if $(WL_WEXT),WL_WEXT=1) \
modules
+ # NVRAM stub
+ $(TARGET_CC) $(TARGET_CFLAGS) -c -o $(PKG_BUILD_DIR)/nvram/nvram_stub.o $(PKG_BUILD_DIR)/nvram/nvram_stub.c
+
# Compile wlc
$(MAKE) -C $(PKG_BUILD_DIR)/wlc \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
all
+
# Compile libshared
$(MAKE) -C $(PKG_BUILD_DIR)/router/shared \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -I. -I$(PKG_BUILD_DIR)/include -Dlinux=1" \
all
- $(TARGET_CC) -o $(PKG_BUILD_DIR)/nas $(PKG_BUILD_DIR)/nas_exe.o $(TARGET_LDFLAGS) -lnvram $(PKG_BUILD_DIR)/router/shared/libshared.a
+ $(TARGET_CC) -o $(PKG_BUILD_DIR)/nas \
+ $(PKG_BUILD_DIR)/nas_exe.o \
+ $(PKG_BUILD_DIR)/nvram/nvram_stub.o \
+ $(TARGET_LDFLAGS) \
+ $(PKG_BUILD_DIR)/router/shared/libshared.a
$(TARGET_CC) -o $(PKG_BUILD_DIR)/wl $(PKG_BUILD_DIR)/wl_exe.o
endef
diff --git a/package/broadcom-wl/src/nvram/nvram_stub.c b/package/broadcom-wl/src/nvram/nvram_stub.c
new file mode 100644
index 0000000000..7fdbf3406b
--- /dev/null
+++ b/package/broadcom-wl/src/nvram/nvram_stub.c
@@ -0,0 +1,16 @@
+#include <stdlib.h>
+
+int nvram_set(const char *name, const char *value)
+{
+ return -1;
+}
+
+char *nvram_get(const char *name)
+{
+ return NULL;
+}
+
+int nvram_unset(const char *name)
+{
+ return -1;
+}