git getting started
2019/4/25--
after committing to blessed.
modify dependency file to download file so as to get latest!
git status:
on what branch
modification
git diff:
git branch:
git log --stat
see all commit
1. setup repository
local
fork:
blessed
2. commit, push and pull
2.1 commit staged changes
2.2 git push origin
git remote -v
2.3 in codebeamer, enter in fork, send pull request (develop-->develop)
3. merge
right way?
4. baseline
2.1 create tag
2.2 push tag
3. check work
see blessed?
4. relate task to commit
kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git push fork
fatal: 'fork' does not appear to be a git repository
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git remote -v
blessed ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-blessed (fetch)
blessed ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-blessed (push)
kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git status
On branch develop
Your branch is up-to-date with 'blessed/develop'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: make/prj_default/m_project_cfg.mak
no changes added to commit (use "git add" and/or "git commit -a")
kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git diff
diff --git a/make/prj_default/m_project_cfg.mak b/make/prj_default/m_project_cfg.mak
index 091704c..818832f 100644
--- a/make/prj_default/m_project_cfg.mak
+++ b/make/prj_default/m_project_cfg.mak
@@ -66,8 +66,8 @@ include $(W_POT_AR_WORK_PATH)/make/post_build_cfg.mak
#--- pot generic variant --- default / debug_uart / debug_xcp ---#
POT_GENERIC_VARIANT = default
-#--- latch variant --- Witte / Brose / Nissan ---#
-LATCH_VARIANT = Witte
+#--- latch variant --- Witte / Brose / Nissan /Magna ---#^M
+LATCH_VARIANT = Magna^M
diff --git a/make/prj_default/m_project_cfg.mak b/make/prj_default/m_project_cfg.mak
index 091704c..818832f 100644
--- a/make/prj_default/m_project_cfg.mak
+++ b/make/prj_default/m_project_cfg.mak
@@ -66,8 +66,8 @@ include $(W_POT_AR_WORK_PATH)/make/post_build_cfg.mak
#--- pot generic variant --- default / debug_uart / debug_xcp ---#
POT_GENERIC_VARIANT = default
-#--- latch variant --- Witte / Brose / Nissan ---#
-LATCH_VARIANT = Witte
+#--- latch variant --- Witte / Brose / Nissan /Magna ---#^M
+LATCH_VARIANT = Magna^M
#--- ecu abstraction variant --- mgb_relay / mgb_halfbridge ---#
ECU_AB_VARIANT = mgb_halfbridge
@@ -129,9 +129,9 @@ IMPORT_SCI_HEADER_PATH += -I M_pot_ar_hmi/Mod_HMI/inc
IMPORT_SCI_HEADER_PATH += -I M_pot_ar_hmi/Mod_NetworkButton/inc
IMPORT_SCI_HEADER_PATH += -I M_pot_ar_hmi/Mod_SensorButton/inc
IMPORT_SCI_HEADER_PATH += -I M_pot_ar_hmi/inc
-IMPORT_SCI_HEADER_PATH += -I M_pot_ar_latch/Mod_SensorLatch/inc
-IMPORT_SCI_HEADER_PATH += -I M_pot_ar_latch/Mod_LatchControl/inc
-IMPORT_SCI_HEADER_PATH += -I M_pot_ar_latch/inc
+#IMPORT_SCI_HEADER_PATH += -I private/M_pot_ar_latch/Mod_SensorLatch/inc^M
+#IMPORT_SCI_HEADER_PATH += -I private/M_pot_ar_latch/Mod_LatchControl/inc^M
+#IMPORT_SCI_HEADER_PATH += -I private/M_pot_ar_latch/inc^M
IMPORT_SCI_HEADER_PATH += -I M_pot_ar_parameter/Mod_Parameter/inc
IMPORT_SCI_HEADER_PATH += -I $(W_POT_AR_CFG_PATH)/Mod_BusControl/inc
IMPORT_SCI_HEADER_PATH += -I $(W_POT_AR_CFG_PATH)/Mod_MainControl/inc
@@ -238,7 +238,7 @@ LIBRARY_QAC += M_pot_ar_ecu_ab/output/$(PROJECT_NAME)/library/M_pot_ar_ecu_ab_$(
LIBRARY_QAC += M_pot_ar_diagnosis/output/$(PROJECT_NAME)/library/M_pot_ar_diagnosis_$(VARIANT).lib
LIBRARY_QAC += M_pot_ar_eol/output/$(PROJECT_NAME)/library/M_pot_ar_eol_$(VARIANT).lib
LIBRARY_QAC += M_pot_ar_hmi/output/$(PROJECT_NAME)/library/M_pot_ar_hmi_$(VARIANT).lib
-LIBRARY_QAC += M_pot_ar_latch/output/$(PROJECT_NAME)/library/M_pot_ar_latch_$(LATCH_VARIANT)_$(VARIANT).lib
+#LIBRARY_QAC += library/L_pot_ar_latch/lib/M_pot_ar_latch_$(LATCH_VARIANT)_$(VARIANT).lib^M
LIBRARY_QAC += M_pot_ar_movement/output/$(PROJECT_NAME)/library/M_pot_ar_movement_$(VARIANT).lib
LIBRARY_QAC += M_pot_ar_position/output/$(PROJECT_NAME)/library/M_pot_ar_position_$(VARIANT).lib
LIBRARY_QAC += M_pot_ar_system/output/$(PROJECT_NAME)/library/M_pot_ar_system_$(VARIANT).lib
@@ -264,7 +264,7 @@ MAKE_QAC += M_pot_ar_ecu_ab/make/$(ECU_AB_VARIANT)
MAKE_QAC += M_pot_ar_diagnosis/make/default
MAKE_QAC += M_pot_ar_eol/make/default
MAKE_QAC += M_pot_ar_hmi/make/default
-MAKE_QAC += M_pot_ar_latch/make/$(LATCH_VARIANT)
+#MAKE_QAC += private/M_pot_ar_latch/make/$(LATCH_VARIANT)^M
MAKE_QAC += M_pot_ar_movement/make/default
MAKE_QAC += M_pot_ar_system/make/default
MAKE_QAC += M_pot_ar_parameter/make/default
kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git status
On branch develop
Your branch is up-to-date with 'blessed/develop'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: make/prj_default/m_project_cfg.mak
no changes added to commit (use "git add" and/or "git commit -a")
kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git branch
* develop
kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git remote -v
blessed ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-blessed (fetch)
blessed ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-blessed (push)
fork ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-kongdel (fetch)
fork ssh://codebeamer@bee.brose.net/git/PG_gwm_chb125_pot-kongdel (push)
kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$
kongdel@SHAC29803 MINGW64 /r/git/SW_gwm_chb125_pot-kongdel/PG_gwm_chb125_pot (develop)
$ git log --stat
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800
latch magna merge
make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530
#279452 : GWM : PG : Makefile updated for POSTBUILD
GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder
Makefile | 2 +-
make/post_build_cfg.mak | 4 +-
make/prj_pbl/linker_ctrl_file.ld | 110 ---------------------------
make/prj_pbl/m_project_cfg.mak | 150 -------------------------------------
make/prj_sbl/generate_checksum.bat | 24 ------
make/prj_sbl/linker_ctrl_file.ld | 62 ---------------
make/prj_sbl/m_project_cfg.mak | 130 --------------------------------
7 files changed, 3 insertions(+), 479 deletions(-)
commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800
latch magna merge
make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530
#279452 : GWM : PG : Makefile updated for POSTBUILD
GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder
Makefile | 2 +-
make/post_build_cfg.mak | 4 +-
make/prj_pbl/linker_ctrl_file.ld | 110 ---------------------------
make/prj_pbl/m_project_cfg.mak | 150 -------------------------------------
make/prj_sbl/generate_checksum.bat | 24 ------
make/prj_sbl/linker_ctrl_file.ld | 62 ---------------
make/prj_sbl/m_project_cfg.mak | 130 --------------------------------
7 files changed, 3 insertions(+), 479 deletions(-)
commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800
latch magna merge
make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530
#279452 : GWM : PG : Makefile updated for POSTBUILD
GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder
Makefile | 2 +-
make/post_build_cfg.mak | 4 +-
make/prj_pbl/linker_ctrl_file.ld | 110 ---------------------------
make/prj_pbl/m_project_cfg.mak | 150 -------------------------------------
make/prj_sbl/generate_checksum.bat | 24 ------
make/prj_sbl/linker_ctrl_file.ld | 62 ---------------
make/prj_sbl/m_project_cfg.mak | 130 --------------------------------
7 files changed, 3 insertions(+), 479 deletions(-)
commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530
#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800
latch magna merge
make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530
#279452 : GWM : PG : Makefile updated for POSTBUILD
GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder
Makefile | 2 +-
make/post_build_cfg.mak | 4 +-
make/prj_pbl/linker_ctrl_file.ld | 110 ---------------------------
make/prj_pbl/m_project_cfg.mak | 150 -------------------------------------
make/prj_sbl/generate_checksum.bat | 24 ------
make/prj_sbl/linker_ctrl_file.ld | 62 ---------------
make/prj_sbl/m_project_cfg.mak | 130 --------------------------------
7 files changed, 3 insertions(+), 479 deletions(-)
commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530
#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition
GWM: PG : Makefile fix for QAC and Duplicate macro definition
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800
latch magna merge
make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530
#279452 : GWM : PG : Makefile updated for POSTBUILD
GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder
Makefile | 2 +-
make/post_build_cfg.mak | 4 +-
make/prj_pbl/linker_ctrl_file.ld | 110 ---------------------------
make/prj_pbl/m_project_cfg.mak | 150 -------------------------------------
make/prj_sbl/generate_checksum.bat | 24 ------
make/prj_sbl/linker_ctrl_file.ld | 62 ---------------
make/prj_sbl/m_project_cfg.mak | 130 --------------------------------
7 files changed, 3 insertions(+), 479 deletions(-)
commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530
#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition
GWM: PG : Makefile fix for QAC and Duplicate macro definition
Makefile | 1 +
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800
latch magna merge
make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530
#279452 : GWM : PG : Makefile updated for POSTBUILD
GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder
Makefile | 2 +-
make/post_build_cfg.mak | 4 +-
make/prj_pbl/linker_ctrl_file.ld | 110 ---------------------------
make/prj_pbl/m_project_cfg.mak | 150 -------------------------------------
make/prj_sbl/generate_checksum.bat | 24 ------
make/prj_sbl/linker_ctrl_file.ld | 62 ---------------
make/prj_sbl/m_project_cfg.mak | 130 --------------------------------
7 files changed, 3 insertions(+), 479 deletions(-)
commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530
#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition
GWM: PG : Makefile fix for QAC and Duplicate macro definition
Makefile | 1 +
make/prj_default/m_project_cfg.mak | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800
latch magna merge
make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530
#279452 : GWM : PG : Makefile updated for POSTBUILD
GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder
Makefile | 2 +-
make/post_build_cfg.mak | 4 +-
make/prj_pbl/linker_ctrl_file.ld | 110 ---------------------------
make/prj_pbl/m_project_cfg.mak | 150 -------------------------------------
make/prj_sbl/generate_checksum.bat | 24 ------
make/prj_sbl/linker_ctrl_file.ld | 62 ---------------
make/prj_sbl/m_project_cfg.mak | 130 --------------------------------
7 files changed, 3 insertions(+), 479 deletions(-)
commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530
#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition
GWM: PG : Makefile fix for QAC and Duplicate macro definition
Makefile | 1 +
make/prj_default/m_project_cfg.mak | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
commit 7c8ef03abc119ca16f11d465ae1135545a2ff1a0
Author: tttawta <Abhinav.Tawta.temp@brose.com>
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800
latch magna merge
make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530
#279452 : GWM : PG : Makefile updated for POSTBUILD
GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder
Makefile | 2 +-
make/post_build_cfg.mak | 4 +-
make/prj_pbl/linker_ctrl_file.ld | 110 ---------------------------
make/prj_pbl/m_project_cfg.mak | 150 -------------------------------------
make/prj_sbl/generate_checksum.bat | 24 ------
make/prj_sbl/linker_ctrl_file.ld | 62 ---------------
make/prj_sbl/m_project_cfg.mak | 130 --------------------------------
7 files changed, 3 insertions(+), 479 deletions(-)
commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530
#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition
GWM: PG : Makefile fix for QAC and Duplicate macro definition
Makefile | 1 +
make/prj_default/m_project_cfg.mak | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
commit 7c8ef03abc119ca16f11d465ae1135545a2ff1a0
Author: tttawta <Abhinav.Tawta.temp@brose.com>
Date: Wed Mar 20 15:30:21 2019 +0530
#266094 : GWM :PG : linker file update to make bootabale
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800
latch magna merge
make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530
#279452 : GWM : PG : Makefile updated for POSTBUILD
GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder
Makefile | 2 +-
make/post_build_cfg.mak | 4 +-
make/prj_pbl/linker_ctrl_file.ld | 110 ---------------------------
make/prj_pbl/m_project_cfg.mak | 150 -------------------------------------
make/prj_sbl/generate_checksum.bat | 24 ------
make/prj_sbl/linker_ctrl_file.ld | 62 ---------------
make/prj_sbl/m_project_cfg.mak | 130 --------------------------------
7 files changed, 3 insertions(+), 479 deletions(-)
commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530
#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition
GWM: PG : Makefile fix for QAC and Duplicate macro definition
Makefile | 1 +
make/prj_default/m_project_cfg.mak | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
commit 7c8ef03abc119ca16f11d465ae1135545a2ff1a0
Author: tttawta <Abhinav.Tawta.temp@brose.com>
Date: Wed Mar 20 15:30:21 2019 +0530
#266094 : GWM :PG : linker file update to make bootabale
GWM :PG : linker file update to make bootabale
:...skipping...
commit 48d6e59a23e1bfd6a2d42e6c6a3f327f1cda0f59 (HEAD -> develop)
Author: kongdel <Delin.Kong@brose.com>
Date: Thu Apr 25 16:51:52 2019 +0800
latch magna merge
make/prj_default/m_project_cfg.mak | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
commit 4713f499c2a9d283d9e005dee6d870d3eb3ae7bb (tag: bsv_A0.1.4, blessed/develop, blessed/HEAD)
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 15:16:17 2019 +0530
#279452 : GWM : PG : Makefile updated for POSTBUILD
GWM : PG : Makefile updated for POSTBUILD moved bootloader makefile to
its folder
Makefile | 2 +-
make/post_build_cfg.mak | 4 +-
make/prj_pbl/linker_ctrl_file.ld | 110 ---------------------------
make/prj_pbl/m_project_cfg.mak | 150 -------------------------------------
make/prj_sbl/generate_checksum.bat | 24 ------
make/prj_sbl/linker_ctrl_file.ld | 62 ---------------
make/prj_sbl/m_project_cfg.mak | 130 --------------------------------
7 files changed, 3 insertions(+), 479 deletions(-)
commit 577e8e85d6a453811ecc6ed0968a8b2f6920447e
Author: karnaaz <Azhar.karnalkar@brose.com>
Date: Fri Mar 29 12:20:58 2019 +0530
#279322 : GWM: PG : Makefile fix for QAC and Duplicate macro definition
GWM: PG : Makefile fix for QAC and Duplicate macro definition
Makefile | 1 +
make/prj_default/m_project_cfg.mak | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
commit 7c8ef03abc119ca16f11d465ae1135545a2ff1a0
Author: tttawta <Abhinav.Tawta.temp@brose.com>
Date: Wed Mar 20 15:30:21 2019 +0530
#266094 : GWM :PG : linker file update to make bootabale
GWM :PG : linker file update to make bootabale
make/prj_default/linker_ctrl_file.ld | 8 ++++----
:
git getting started的更多相关文章
- Git 子模块 - submodule
有种情况我们经常会遇到:某个工作中的项目需要包含并使用另一个项目. 也许是第三方库,或者你 独立开发的,用于多个父项目的库. 现在问题来了:你想要把它们当做两个独立的项目,同时又想在 一个项目中使用另 ...
- Git 在团队中的最佳实践--如何正确使用Git Flow
我们已经从SVN 切换到Git很多年了,现在几乎所有的项目都在使用Github管理, 本篇文章讲一下为什么使用Git, 以及如何在团队中正确使用. Git的优点 Git的优点很多,但是这里只列出我认为 ...
- Git与Repo入门
版本控制 版本控制是什么已不用在说了,就是记录我们对文件.目录或工程等的修改历史,方便查看更改历史,备份以便恢复以前的版本,多人协作... 一.原始版本控制 最原始的版本控制是纯手工的版本控制:修改文 ...
- Git Bash的一些命令和配置
查看git版本号: git --version 如果是第一次使用Git,你需要设置署名和邮箱: $ git config --global user.name "用户名" $ gi ...
- 在Ubuntu 16.10 安装 git 并上传代码至 git.oschina.net
1. 注册一个账号和创建项目 先在git.oschina.net上注册一个账号和新建一个project ,如project name 是"myTest". 2.安装git sudo ...
- 史上最详细git教程
题外话 虽然这个标题很惊悚,不过还是把你骗进来了,哈哈-各位看官不要着急,耐心往下看 Git是什么 Git是目前世界上最先进的分布式版本控制系统. SVN与Git的最主要的区别 SVN是集中式版本控制 ...
- [版本控制之道] Git 常用的命令总结(欢迎收藏备用)
坚持每天学习,坚持每天复习,技术永远学不完,自己永远要前进 总结日常开发生产中常用的Git版本控制命令 ------------------------------main-------------- ...
- 【解决方案】Myeclipse 10 安装 GIT 插件 集成 步骤 图解
工程开发中,往往要使用到集成GIT ,那么下面说说插件安装步骤 PS:以Myeclipse 10 为例,讲解集成安装步骤. ----------------------main------------ ...
- git 命令
切换仓库地址: git remote set-url origin xxx.git切换分支:git checkout name撤销修改:git checkout -- file删除文件:git rm ...
- git亲测命令
一.Git新建本地分支与远程分支关联问题 git checkout -b branch_name origin/branch_name 或者 git branch --set-upstream bra ...
随机推荐
- Exception in thread “main” java.sql.SQLException: No suitable driver
问题背景:通过Spark SQL的jdbc去读取Oracle数据做测试,在本地的idea中没有报任务错误.但是打包到集群的时候报: Exception in thread “main” java.sq ...
- linux 释放内存及查看内存命令
查看内存使用情况: free -m 清理内存: echo 1 > /proc/sys/vm/drop_caches 再次查看内存使用情况 free -m 查看内存条数命令: dmidecode ...
- cocos2d-x android工程接入第三方支付宝SDK
1. 首先去支付宝官网下载开发者文档 2. 然后按着开发者文档将支付宝的sdk导入到你的工程中,并关联到工程中,步骤入下图: (1)将从支付宝官方网站获得的支付宝的sdk的jar包拷贝到工程中的lib ...
- UGUI实现摇杆
效果图
- Error #2148
参考:https://blog.csdn.net/watersevenmmfx/article/details/52980804 chrome flash 安全沙箱冲突 SecurityError: ...
- Hibernate框架第一天
**框架和CRM项目的整体介绍** 1. 什么是CRM * CRM(Customer Relationship Management)客户关系管理,是利用相应的信息技术以及互联网技术来协调企业与顾客间 ...
- C++二进制字符串转十六进制字符串 十六进制字符串转二进制字符串
============================================== 二进制转十六进制 ============================================ ...
- MySQL.ERROR 1133 (42000): Can't find any matching row in the user table
ERROR 1133 (42000): Can't find any matching row in the user table 今天在执行 grant all privileges on cac ...
- clear/reset select2,重置select2,恢复默认
4.0 version //方法一$('#yourButton').on('click', function() { $('#yourfirstSelect2').val(null).trigger( ...
- Android -- ViewGroup源码分析+自定义
1,我们前三篇博客了解了一下自定义View的基本方法和流程 从源码的角度一步步打造自己的TextView 深入了解自定义属性 onMeasure()源码分析 之前,我们只是学习过自定义View,其实自 ...