{"action":"created","comment":{"url":"https://api.github.com/repos/OP-TEE/optee_os/pulls/comments/182950524","pull_request_review_id":113854512,"id":182950524,"diff_hunk":"@@ -260,74 +237,50 @@\n  */\n \n /* emulated SRAM, at start of secure DDR */\n-\n #define CFG_CORE_TZSRAM_EMUL_START\t0x4E000000\n \n #define TZSRAM_BASE\t\t\tCFG_CORE_TZSRAM_EMUL_START\n #define TZSRAM_SIZE\t\t\tCFG_CORE_TZSRAM_EMUL_SIZE\n \n /* Location of trusted dram */\n \n-#define CFG_DDR_TEETZ_RESERVED_START\t0x4E100000\n-#define CFG_DDR_TEETZ_RESERVED_SIZE\t0x01F00000\n-\n-#define CFG_PUB_RAM_SIZE\t\t(1 * 1024 * 1024)\n+#define CFG_TEE_RAM_VA_SIZE             (1 * 1024 * 1024)\n #define CFG_TEE_RAM_PH_SIZE\t\tTZSRAM_SIZE\n \n-#define TZDRAM_BASE\t\t\t(CFG_DDR_TEETZ_RESERVED_START)\n-#define TZDRAM_SIZE\t\t\t(CFG_DDR_TEETZ_RESERVED_SIZE - \\\n-\t\t\t\tCFG_PUB_RAM_SIZE)\n+#define CFG_TZDRAM_BASE\t\t\t0x4E100000\n+#define CFG_TZDRAM_SIZE\t\t\t(30 * 1024 * 1024)","path":"core/arch/arm/plat-imx/platform_config.h","position":94,"original_position":94,"commit_id":"1e91b9fa107814ae94d2b043674f8a8a9d48aea5","original_commit_id":"1e91b9fa107814ae94d2b043674f8a8a9d48aea5","user":{"login":"etienne-lms","id":19990310,"avatar_url":"https://avatars3.githubusercontent.com/u/19990310?v=4","gravatar_id":"","url":"https://api.github.com/users/etienne-lms","html_url":"https://github.com/etienne-lms","followers_url":"https://api.github.com/users/etienne-lms/followers","following_url":"https://api.github.com/users/etienne-lms/following{/other_user}","gists_url":"https://api.github.com/users/etienne-lms/gists{/gist_id}","starred_url":"https://api.github.com/users/etienne-lms/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/etienne-lms/subscriptions","organizations_url":"https://api.github.com/users/etienne-lms/orgs","repos_url":"https://api.github.com/users/etienne-lms/repos","events_url":"https://api.github.com/users/etienne-lms/events{/privacy}","received_events_url":"https://api.github.com/users/etienne-lms/received_events","type":"User","site_admin":false},"body":"So this change will break the config when one enables `CFG_WITH_PAGER=y`.\r\nMaybe you can **not set** these default defines in **conf.mk** when pager is enabled.\r\n\r\nAnother way could be that you create and upstream a platform config def script file (I.e **plat-imx/configs/imx<yourtarget>_defconfig.mk**) that defines the \"official default platform config\" (TZDRAM, SHMEM, ...) and have the optee build command to invoke something like:\r\n```bash\r\nmake -C path/to/optee_os CFG_OPTEE_CONFIG=path/to/imx<yourtarget>_defconfig.mk\r\n```\r\nThis prevents from breaking current and provides means to clearly define the promoted platform default config. This should not prevent forcing configs from something like\r\n```bash\r\nmake CFG_OPTEE_CONFIG=core/arch/arm/plat-imx/imx79_defconfig.mk CFG_TEE_CORE_DEBUG=y CFG_TEE_CORE_EMBED_INTERNAL_TESTS=y\r\n```\r\n\r\n.\r\nAnother way is that we get the approvals from the related imx maintainers for any changes in plat-imx that could break alternate default configs.","created_at":"2018-04-20T05:44:44Z","updated_at":"2018-04-20T05:44:44Z","html_url":"https://github.com/OP-TEE/optee_os/pull/2261#discussion_r182950524","pull_request_url":"https://api.github.com/repos/OP-TEE/optee_os/pulls/2261","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/OP-TEE/optee_os/pulls/comments/182950524"},"html":{"href":"https://github.com/OP-TEE/optee_os/pull/2261#discussion_r182950524"},"pull_request":{"href":"https://api.github.com/repos/OP-TEE/optee_os/pulls/2261"}},"in_reply_to_id":182808652},"pull_request":{"url":"https://api.github.com/repos/OP-TEE/optee_os/pulls/2261","id":182512654,"html_url":"https://github.com/OP-TEE/optee_os/pull/2261","diff_url":"https://github.com/OP-TEE/optee_os/pull/2261.diff","patch_url":"https://github.com/OP-TEE/optee_os/pull/2261.patch","issue_url":"https://api.github.com/repos/OP-TEE/optee_os/issues/2261","number":2261,"state":"open","locked":false,"title":"plat-imx: make memory layout configurable","user":{"login":"jordanrh1","id":11446053,"avatar_url":"https://avatars1.githubusercontent.com/u/11446053?v=4","gravatar_id":"","url":"https://api.github.com/users/jordanrh1","html_url":"https://github.com/jordanrh1","followers_url":"https://api.github.com/users/jordanrh1/followers","following_url":"https://api.github.com/users/jordanrh1/following{/other_user}","gists_url":"https://api.github.com/users/jordanrh1/gists{/gist_id}","starred_url":"https://api.github.com/users/jordanrh1/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jordanrh1/subscriptions","organizations_url":"https://api.github.com/users/jordanrh1/orgs","repos_url":"https://api.github.com/users/jordanrh1/repos","events_url":"https://api.github.com/users/jordanrh1/events{/privacy}","received_events_url":"https://api.github.com/users/jordanrh1/received_events","type":"User","site_admin":false},"body":"Enable the load address and size of OPTEE to be configured via the\r\nfollowing options:\r\n - CFG_TZDRAM_BASE\r\n - CFG_TZDRAM_SIZE\r\n - CFG_SHMEM_BASE\r\n - CFG_SHMEM_SIZE\r\n\r\n<!--\r\n    If you are new to submitting pull requests to OP-TEE, then please have a\r\n    look at the list below and tick them off before submitting the pull request.\r\n\r\n    1. Read our contribution guidelines:\r\n         documentation/github.md.\r\n\r\n    2. Read the contribution section in Notice.md and pay extra attention to the\r\n       \"Developer Certificate of Origin\" part:\r\n         https://github.com/OP-TEE/optee_os/blob/master/Notice.md#contributions.\r\n\r\n    3. You should run checkpatch preferably before submitting the pull request.\r\n\r\n    4. When everything has been reviewed, you will need to squash, rebase and\r\n       add tags like `Reviewed-by`, `Acked-by`, `Tested-by` etc.\r\n\r\n    NOTE: This comment will not be shown in the pull request, so no harm keeping\r\n    it, but feel free to remove it if you like.\r\n-->\r\n","created_at":"2018-04-18T15:11:51Z","updated_at":"2018-04-20T05:44:44Z","closed_at":null,"merged_at":null,"merge_commit_sha":"58c4cbcc97bb5c513f55c9f28b8750141f2c252c","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/OP-TEE/optee_os/pulls/2261/commits","review_comments_url":"https://api.github.com/repos/OP-TEE/optee_os/pulls/2261/comments","review_comment_url":"https://api.github.com/repos/OP-TEE/optee_os/pulls/comments{/number}","comments_url":"https://api.github.com/repos/OP-TEE/optee_os/issues/2261/comments","statuses_url":"https://api.github.com/repos/OP-TEE/optee_os/statuses/1e91b9fa107814ae94d2b043674f8a8a9d48aea5","head":{"label":"jordanrh1:cfg-address-layout","ref":"cfg-address-layout","sha":"1e91b9fa107814ae94d2b043674f8a8a9d48aea5","user":{"login":"jordanrh1","id":11446053,"avatar_url":"https://avatars1.githubusercontent.com/u/11446053?v=4","gravatar_id":"","url":"https://api.github.com/users/jordanrh1","html_url":"https://github.com/jordanrh1","followers_url":"https://api.github.com/users/jordanrh1/followers","following_url":"https://api.github.com/users/jordanrh1/following{/other_user}","gists_url":"https://api.github.com/users/jordanrh1/gists{/gist_id}","starred_url":"https://api.github.com/users/jordanrh1/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jordanrh1/subscriptions","organizations_url":"https://api.github.com/users/jordanrh1/orgs","repos_url":"https://api.github.com/users/jordanrh1/repos","events_url":"https://api.github.com/users/jordanrh1/events{/privacy}","received_events_url":"https://api.github.com/users/jordanrh1/received_events","type":"User","site_admin":false},"repo":{"id":123195938,"name":"optee_os-public","full_name":"jordanrh1/optee_os-public","owner":{"login":"jordanrh1","id":11446053,"avatar_url":"https://avatars1.githubusercontent.com/u/11446053?v=4","gravatar_id":"","url":"https://api.github.com/users/jordanrh1","html_url":"https://github.com/jordanrh1","followers_url":"https://api.github.com/users/jordanrh1/followers","following_url":"https://api.github.com/users/jordanrh1/following{/other_user}","gists_url":"https://api.github.com/users/jordanrh1/gists{/gist_id}","starred_url":"https://api.github.com/users/jordanrh1/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jordanrh1/subscriptions","organizations_url":"https://api.github.com/users/jordanrh1/orgs","repos_url":"https://api.github.com/users/jordanrh1/repos","events_url":"https://api.github.com/users/jordanrh1/events{/privacy}","received_events_url":"https://api.github.com/users/jordanrh1/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jordanrh1/optee_os-public","description":"Trusted side of the TEE","fork":true,"url":"https://api.github.com/repos/jordanrh1/optee_os-public","forks_url":"https://api.github.com/repos/jordanrh1/optee_os-public/forks","keys_url":"https://api.github.com/repos/jordanrh1/optee_os-public/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jordanrh1/optee_os-public/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jordanrh1/optee_os-public/teams","hooks_url":"https://api.github.com/repos/jordanrh1/optee_os-public/hooks","issue_events_url":"https://api.github.com/repos/jordanrh1/optee_os-public/issues/events{/number}","events_url":"https://api.github.com/repos/jordanrh1/optee_os-public/events","assignees_url":"https://api.github.com/repos/jordanrh1/optee_os-public/assignees{/user}","branches_url":"https://api.github.com/repos/jordanrh1/optee_os-public/branches{/branch}","tags_url":"https://api.github.com/repos/jordanrh1/optee_os-public/tags","blobs_url":"https://api.github.com/repos/jordanrh1/optee_os-public/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jordanrh1/optee_os-public/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jordanrh1/optee_os-public/git/refs{/sha}","trees_url":"https://api.github.com/repos/jordanrh1/optee_os-public/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jordanrh1/optee_os-public/statuses/{sha}","languages_url":"https://api.github.com/repos/jordanrh1/optee_os-public/languages","stargazers_url":"https://api.github.com/repos/jordanrh1/optee_os-public/stargazers","contributors_url":"https://api.github.com/repos/jordanrh1/optee_os-public/contributors","subscribers_url":"https://api.github.com/repos/jordanrh1/optee_os-public/subscribers","subscription_url":"https://api.github.com/repos/jordanrh1/optee_os-public/subscription","commits_url":"https://api.github.com/repos/jordanrh1/optee_os-public/commits{/sha}","git_commits_url":"https://api.github.com/repos/jordanrh1/optee_os-public/git/commits{/sha}","comments_url":"https://api.github.com/repos/jordanrh1/optee_os-public/comments{/number}","issue_comment_url":"https://api.github.com/repos/jordanrh1/optee_os-public/issues/comments{/number}","contents_url":"https://api.github.com/repos/jordanrh1/optee_os-public/contents/{+path}","compare_url":"https://api.github.com/repos/jordanrh1/optee_os-public/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jordanrh1/optee_os-public/merges","archive_url":"https://api.github.com/repos/jordanrh1/optee_os-public/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jordanrh1/optee_os-public/downloads","issues_url":"https://api.github.com/repos/jordanrh1/optee_os-public/issues{/number}","pulls_url":"https://api.github.com/repos/jordanrh1/optee_os-public/pulls{/number}","milestones_url":"https://api.github.com/repos/jordanrh1/optee_os-public/milestones{/number}","notifications_url":"https://api.github.com/repos/jordanrh1/optee_os-public/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jordanrh1/optee_os-public/labels{/name}","releases_url":"https://api.github.com/repos/jordanrh1/optee_os-public/releases{/id}","deployments_url":"https://api.github.com/repos/jordanrh1/optee_os-public/deployments","created_at":"2018-02-27T22:21:49Z","updated_at":"2018-02-27T22:22:07Z","pushed_at":"2018-04-19T15:43:42Z","git_url":"git://github.com/jordanrh1/optee_os-public.git","ssh_url":"git@github.com:jordanrh1/optee_os-public.git","clone_url":"https://github.com/jordanrh1/optee_os-public.git","svn_url":"https://github.com/jordanrh1/optee_os-public","homepage":null,"size":12916,"stargazers_count":0,"watchers_count":0,"language":"C","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"OP-TEE:master","ref":"master","sha":"7531fb245b0e8a4965e231c47b55249402acbe89","user":{"login":"OP-TEE","id":7488961,"avatar_url":"https://avatars1.githubusercontent.com/u/7488961?v=4","gravatar_id":"","url":"https://api.github.com/users/OP-TEE","html_url":"https://github.com/OP-TEE","followers_url":"https://api.github.com/users/OP-TEE/followers","following_url":"https://api.github.com/users/OP-TEE/following{/other_user}","gists_url":"https://api.github.com/users/OP-TEE/gists{/gist_id}","starred_url":"https://api.github.com/users/OP-TEE/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OP-TEE/subscriptions","organizations_url":"https://api.github.com/users/OP-TEE/orgs","repos_url":"https://api.github.com/users/OP-TEE/repos","events_url":"https://api.github.com/users/OP-TEE/events{/privacy}","received_events_url":"https://api.github.com/users/OP-TEE/received_events","type":"Organization","site_admin":false},"repo":{"id":20193261,"name":"optee_os","full_name":"OP-TEE/optee_os","owner":{"login":"OP-TEE","id":7488961,"avatar_url":"https://avatars1.githubusercontent.com/u/7488961?v=4","gravatar_id":"","url":"https://api.github.com/users/OP-TEE","html_url":"https://github.com/OP-TEE","followers_url":"https://api.github.com/users/OP-TEE/followers","following_url":"https://api.github.com/users/OP-TEE/following{/other_user}","gists_url":"https://api.github.com/users/OP-TEE/gists{/gist_id}","starred_url":"https://api.github.com/users/OP-TEE/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OP-TEE/subscriptions","organizations_url":"https://api.github.com/users/OP-TEE/orgs","repos_url":"https://api.github.com/users/OP-TEE/repos","events_url":"https://api.github.com/users/OP-TEE/events{/privacy}","received_events_url":"https://api.github.com/users/OP-TEE/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/OP-TEE/optee_os","description":"Trusted side of the TEE","fork":false,"url":"https://api.github.com/repos/OP-TEE/optee_os","forks_url":"https://api.github.com/repos/OP-TEE/optee_os/forks","keys_url":"https://api.github.com/repos/OP-TEE/optee_os/keys{/key_id}","collaborators_url":"https://api.github.com/repos/OP-TEE/optee_os/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/OP-TEE/optee_os/teams","hooks_url":"https://api.github.com/repos/OP-TEE/optee_os/hooks","issue_events_url":"https://api.github.com/repos/OP-TEE/optee_os/issues/events{/number}","events_url":"https://api.github.com/repos/OP-TEE/optee_os/events","assignees_url":"https://api.github.com/repos/OP-TEE/optee_os/assignees{/user}","branches_url":"https://api.github.com/repos/OP-TEE/optee_os/branches{/branch}","tags_url":"https://api.github.com/repos/OP-TEE/optee_os/tags","blobs_url":"https://api.github.com/repos/OP-TEE/optee_os/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/OP-TEE/optee_os/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/OP-TEE/optee_os/git/refs{/sha}","trees_url":"https://api.github.com/repos/OP-TEE/optee_os/git/trees{/sha}","statuses_url":"https://api.github.com/repos/OP-TEE/optee_os/statuses/{sha}","languages_url":"https://api.github.com/repos/OP-TEE/optee_os/languages","stargazers_url":"https://api.github.com/repos/OP-TEE/optee_os/stargazers","contributors_url":"https://api.github.com/repos/OP-TEE/optee_os/contributors","subscribers_url":"https://api.github.com/repos/OP-TEE/optee_os/subscribers","subscription_url":"https://api.github.com/repos/OP-TEE/optee_os/subscription","commits_url":"https://api.github.com/repos/OP-TEE/optee_os/commits{/sha}","git_commits_url":"https://api.github.com/repos/OP-TEE/optee_os/git/commits{/sha}","comments_url":"https://api.github.com/repos/OP-TEE/optee_os/comments{/number}","issue_comment_url":"https://api.github.com/repos/OP-TEE/optee_os/issues/comments{/number}","contents_url":"https://api.github.com/repos/OP-TEE/optee_os/contents/{+path}","compare_url":"https://api.github.com/repos/OP-TEE/optee_os/compare/{base}...{head}","merges_url":"https://api.github.com/repos/OP-TEE/optee_os/merges","archive_url":"https://api.github.com/repos/OP-TEE/optee_os/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/OP-TEE/optee_os/downloads","issues_url":"https://api.github.com/repos/OP-TEE/optee_os/issues{/number}","pulls_url":"https://api.github.com/repos/OP-TEE/optee_os/pulls{/number}","milestones_url":"https://api.github.com/repos/OP-TEE/optee_os/milestones{/number}","notifications_url":"https://api.github.com/repos/OP-TEE/optee_os/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/OP-TEE/optee_os/labels{/name}","releases_url":"https://api.github.com/repos/OP-TEE/optee_os/releases{/id}","deployments_url":"https://api.github.com/repos/OP-TEE/optee_os/deployments","created_at":"2014-05-26T17:18:57Z","updated_at":"2018-04-19T15:03:52Z","pushed_at":"2018-04-19T19:34:47Z","git_url":"git://github.com/OP-TEE/optee_os.git","ssh_url":"git@github.com:OP-TEE/optee_os.git","clone_url":"https://github.com/OP-TEE/optee_os.git","svn_url":"https://github.com/OP-TEE/optee_os","homepage":null,"size":12895,"stargazers_count":378,"watchers_count":378,"language":"C","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":332,"mirror_url":null,"archived":false,"open_issues_count":172,"license":{"key":"other","name":"Other","spdx_id":null,"url":null},"forks":332,"open_issues":172,"watchers":378,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/OP-TEE/optee_os/pulls/2261"},"html":{"href":"https://github.com/OP-TEE/optee_os/pull/2261"},"issue":{"href":"https://api.github.com/repos/OP-TEE/optee_os/issues/2261"},"comments":{"href":"https://api.github.com/repos/OP-TEE/optee_os/issues/2261/comments"},"review_comments":{"href":"https://api.github.com/repos/OP-TEE/optee_os/pulls/2261/comments"},"review_comment":{"href":"https://api.github.com/repos/OP-TEE/optee_os/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/OP-TEE/optee_os/pulls/2261/commits"},"statuses":{"href":"https://api.github.com/repos/OP-TEE/optee_os/statuses/1e91b9fa107814ae94d2b043674f8a8a9d48aea5"}},"author_association":"CONTRIBUTOR"}}
{"actor":{"display_login":"etienne-lms"}}