summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cleopatre/Config.bundle-av3
-rw-r--r--cleopatre/Makefile10
-rw-r--r--cleopatre/buildroot/package/p1905_managerd/p1905_managerd.mk10
-rw-r--r--cleopatre/devkit/p1905_managerd/src/cmdu_message_parse.c2
-rw-r--r--cleopatre/devkit/p1905_managerd/src/p1905_ap_autoconfig.c1
5 files changed, 21 insertions, 5 deletions
diff --git a/cleopatre/Config.bundle-av b/cleopatre/Config.bundle-av
index 1de9b4b6be..2743108b07 100644
--- a/cleopatre/Config.bundle-av
+++ b/cleopatre/Config.bundle-av
@@ -9,5 +9,6 @@ PLC_BINS= plcd plcdrv
RT5572DRV_BINS= rt5572drv
MT7601UDRV_BINS= mt7601udrv
P1905_BINS= p1905_managerd
-P1905_ENABLE_BORAD=mpr520 mpr520e
+P1905_BIN_TYPE=no_wifi ap_enrollee ap_registrar
+P1905_REF_BOARD=mpr520e
GEN_BINS=uboot linux flashfs
diff --git a/cleopatre/Makefile b/cleopatre/Makefile
index 507f8decbb..91d4cffdba 100644
--- a/cleopatre/Makefile
+++ b/cleopatre/Makefile
@@ -32,6 +32,9 @@ BUNDLE_PLCBIN_PATH=$(BUNDLE_PATH)/binaries
BUNDLE_RT5572DRV_PATH=$(BUNDLE_PATH)/rt5572drv
BUNDLE_MT7601UDRV_PATH=$(BUNDLE_PATH)/mt7601udrv
BUNDLE_P1905BIN_PATH=$(BUNDLE_PATH)/p1905_managerd
+no_wifi_1905_config:=
+ap_enrollee_1905_config:=-wifi_support -wifi_role=enrollee -wifi_chip=mt7601
+ap_registrar_1905_config:=-wifi_support -wifi_role=registrar -wifi_chip=mt7601
CLEOPATRE_PATH=$(WORK_DIRECTORY)/cleopatre
CESAR_PATH=$(WORK_DIRECTORY)/cesar
@@ -210,12 +213,15 @@ mt7601udrv:
$(Q)cp $(MT7601UDRV_PATH)/RT2870AP.dat $(BUNDLE_MT7601UDRV_PATH)/RT2870AP.dat
$(Q)cp $(MT7601UDRV_PATH)/S32wifi $(BUNDLE_MT7601UDRV_PATH)/S32wifi
-p1905_managerd: $(foreach eboard,$(P1905_ENABLE_BORAD),p1905_managerd-$(eboard))
+p1905_managerd: $(foreach type,$(P1905_BIN_TYPE),p1905_managerd-$(type))
p1905_managerd-%:
-$(Q)$(MAKE) -C $(CLEOPATRE_PATH)/buildroot clean distclean
- $(Q)$(MAKE) -C $(CLEOPATRE_PATH)/buildroot $*_defconfig
+ $(Q)$(MAKE) -C $(CLEOPATRE_PATH)/buildroot ${P1905_REF_BOARD}_defconfig
$(Q)$(MAKE) -C $(CLEOPATRE_PATH)/buildroot p1905_managerd
+ $(Q)$(MAKE) -C $(P1905_MANAGERD_PATH) clean
+ $(Q)cd $(P1905_MANAGERD_PATH);$(P1905_MANAGERD_PATH)/p1905-config $($*_1905_config)
+ $(Q)$(MAKE) -C $(P1905_MANAGERD_PATH)
$(Q)cp $(P1905_MANAGERD_PATH)/p1905_managerd $(BUNDLE_P1905BIN_PATH)/$@
$(Q)cp $(P1905_MANAGERD_PATH)/S98p1905 $(BUNDLE_P1905BIN_PATH)/S98p1905
diff --git a/cleopatre/buildroot/package/p1905_managerd/p1905_managerd.mk b/cleopatre/buildroot/package/p1905_managerd/p1905_managerd.mk
index 18141438d2..4a2d782cff 100644
--- a/cleopatre/buildroot/package/p1905_managerd/p1905_managerd.mk
+++ b/cleopatre/buildroot/package/p1905_managerd/p1905_managerd.mk
@@ -54,7 +54,15 @@ else
P1905_MANAGERD_CONFIG:=
P1905_MANAGERD_MAKE:=
P1905_MANAGERD_DEV_CLEAN:=
- P1905_MANAGERD_BIN:=p1905_managerd-$(BR2_PROJECT)
+ifeq ($(strip $(BR2_PACKAGE_P1905_MANAGERD_NO_WIFI)),y)
+ P1905_MANAGERD_BIN:=p1905_managerd-no_wifi
+endif
+ifeq ($(strip $(BR2_PACKAGE_P1905_MANAGERD_AP_ENROLLEE)),y)
+ P1905_MANAGERD_BIN:=p1905_managerd-ap_enrollee
+endif
+ifeq ($(strip $(BR2_PACKAGE_P1905_MANAGERD_AP_REGISTRAR)),y)
+ P1905_MANAGERD_BIN:=p1905_managerd-ap_registrar
+endif
endif
p1905_managerd-dev-clean:
diff --git a/cleopatre/devkit/p1905_managerd/src/cmdu_message_parse.c b/cleopatre/devkit/p1905_managerd/src/cmdu_message_parse.c
index ef65404f06..3d7eb5fa4a 100644
--- a/cleopatre/devkit/p1905_managerd/src/cmdu_message_parse.c
+++ b/cleopatre/devkit/p1905_managerd/src/cmdu_message_parse.c
@@ -1774,7 +1774,7 @@ int parse_cmdu_message(struct p1905_managerd_ctx *ctx, unsigned char *buf,
#ifdef SUPPORT_AP_AUTO_CONFIG
#ifdef SUPPORT_AP_REGISTRAR
case AP_AUTOCONFIG_SEARCH:
- debug("got AP_AUTOCONFIG_SEARCH\n");
+ debug_syslog("got AP_AUTOCONFIG_SEARCH\n");
//ctx->need_relay = 1;
if(0 > parse_ap_autoconfig_search_message(ctx, temp_buf, al_mac))
{
diff --git a/cleopatre/devkit/p1905_managerd/src/p1905_ap_autoconfig.c b/cleopatre/devkit/p1905_managerd/src/p1905_ap_autoconfig.c
index 884131df5f..f6edf20c02 100644
--- a/cleopatre/devkit/p1905_managerd/src/p1905_ap_autoconfig.c
+++ b/cleopatre/devkit/p1905_managerd/src/p1905_ap_autoconfig.c
@@ -57,6 +57,7 @@ void ap_autoconfig_init(struct p1905_managerd_ctx *ctx)
libspid_error_t ret;
debug_syslog("AP is an registrar\n");
+ ctx->need_ap_config = 0;
if(LIBSPID_SUCCESS == libspid_config_read_item(LIBSPID_WEB_RESET_INFO_PATH,
LIBSPID_WEB_RESET_INFO_LABEL_WIFI_CFG_CHANGE, status, 5))
{