Skip to content

mx6_cubox-i_spl: Do not write to string constant #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
warped-rudi wants to merge 1 commit into
base: imx6
Choose a base branch
from
Open

mx6_cubox-i_spl: Do not write to string constant #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions board/solidrun/mx6_cubox-i/mx6_cubox-i_spl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ enum boot_device get_boot_device(void) {

static const char *build_dts_name(void)
{
char *dt_prefix;
char *dt_suffix;
const char *dt_prefix, *dt_suffix;
static char dt_name[48];
int val1, val2, val3;

switch (spl_get_imx_type()){
Expand Down Expand Up @@ -119,11 +119,12 @@ static const char *build_dts_name(void)

/*
* Machine selection -
* Machine val1, val2
* -------------------------
* HB rev 3.x x 0
* CBi 0 1
* HB 1 1
* Machine val1, val2, val3
* -------------------------------
* HB2 x x 0
* HB rev 3.x x 0 1
* CBi 0 1 1
* HB 1 1 1
*/

if (val3 == 0) {
Expand All @@ -136,7 +137,7 @@ static const char *build_dts_name(void)
dt_suffix = "-hummingboard.dtb";
}

return strcat(dt_prefix, dt_suffix);
return strcat(strcpy(dt_name, dt_prefix), dt_suffix);
}

#include "asm/arch/mx6_ddr_regs.h"
Expand Down